库存调拨修改

controllers/his_api_controller.go

@@ -878,6 +878,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
+		//获取是否开启保存耗材出库的开关
+		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
 			"advices_template": advices,
@@ -889,6 +891,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"additions":        additions,
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
+			"goodOutOpen":      goodOutOpen,
 		})
 	}
 	if adminInfo.CurrentOrgId != 9675 && adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10215 {
@@ -919,6 +922,8 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
+		//获取是否开启保存耗材出库的开关
+		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
@@ -931,6 +936,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"additions":        additions,
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
+			"goodOutOpen":      goodOutOpen,
 		})
 	}
 }
@@ -2344,6 +2350,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 					//查询是否生成出库单
 					out, _ := service.FindPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime)
+
 					if out.ID == 0 {
 						service.AddSigleWarehouseOut(&warehouseOut)
 					}
@@ -5539,7 +5546,7 @@ type Custom struct {
 	ItemId           int64
 }
 
-//获取个人信息----挂号-----上传就诊信息
+// 获取个人信息----挂号-----上传就诊信息
 func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -5710,7 +5717,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 }
 
-//上传明细----结算
+// 上传明细----结算
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -6555,7 +6562,7 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 }
 
-//退款
+// 退款
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	order, _ := service.GetHisOrderByID(order_id)
@@ -9359,7 +9366,7 @@ func RemoveRepeatedTeam(arr []*models.HisOrderInfoTwo) (newArr []*models.HisOrde
 	return
 }
 
-//修改处方退库操作 参数传修改之前的处方数据
+// 修改处方退库操作 参数传修改之前的处方数据
 func DeleteDrugWarehosueInfo(advice models.HisDoctorAdviceInfo) (err error) {
 
 	if advice.ExecutionState == 1 {

service/stock_service.go

@@ -39,7 +39,7 @@ func FindAllDealerTotal(orgId int64) (total int64) {
 	return
 }
 
-//获取经销商的名称
+// 获取经销商的名称
 func FindAllDealerName(orgId int64) (tmp []*models.Dealer, err error) {
 	err = readDb.Model(&models.Dealer{}).Where("org_id = ? and status = 1", orgId).Find(&tmp).Error
 	return
@@ -91,7 +91,7 @@ func ModifyManufacturer(manufacturer *models.Manufacturer) error {
 	return err
 }
 
-//获取生产厂商名称
+// 获取生产厂商名称
 func FindAllManufacturerName(orgid int64) (tmp []*models.Manufacturer, err error) {
 	err = readDb.Model(&models.Manufacturer{}).Where("org_id = ? and status = 1", orgid).Find(&tmp).Error
 	return
@@ -3606,10 +3606,10 @@ func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 	return list, err
 }
 
-//func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
-//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
-//	return list, err
-//}
+//	func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
+//		err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//		return list, err
+//	}
 func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
 	var dealer models.Dealer
 	var err error
@@ -6515,7 +6515,7 @@ func GetAllDrugFlowById(drugid int64, patient_id int64, advicedate int64, orgid
 	return info, err
 }
 
-//耗材加库存
+// 耗材加库存
 func ModifyGoodAddInformation(good_id int64, sum_count int64, orgid int64) (models.GoodInfo, error) {
 
 	info := models.GoodInfo{}
@@ -6583,7 +6583,7 @@ func GetWarehouseInfoByIdTwenty(id int64, orgid int64) (models.WarehousingInfo,
 	return info, err
 }
 
-//药品加库存
+// 药品加库存
 func ModifyDrugAddInformation(drug_id int64, sum_count int64, orgid int64) (models.BaseDrugLib, error) {
 
 	info := models.BaseDrugLib{}
@@ -8372,7 +8372,7 @@ func DeleteGoodFlow(good_id int64, sys_record_time int64, org_id int64, project_
 func FindPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Find(&out).Error
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ? and is_sys=1", org_id, warehouse_out_time).Find(&out).Error
 	return out, err
 
 }
@@ -8380,7 +8380,7 @@ func FindPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (model
 func FindLastPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Last(&out).Error
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ? and is_sys=1", org_id, warehouse_out_time).Last(&out).Error
 	return out, err
 
 }
@@ -8495,3 +8495,10 @@ func GetNewWarehouseOutInfoList(start_time int64, end_time int64, orgid int64, g
 	err = db.Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&info).Error
 	return info, err
 }
+
+func GetGoodOutOpenConfigOne(user_org_id int64) (models.XtGoodOutConfig, error) {
+
+	config := models.XtGoodOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	return config, err
+}

service/warhouse_service.go

@@ -9884,7 +9884,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 	//	return errors.New("库存数量不足")
 	//}
 
-	if warehouse.StockCount-maxNumber > 0 {
+	if warehouse.StockCount-maxNumber >= 0 {
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 	} else {
 		warehouse.StockCount = warehouse.StockCount