Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -323,7 +323,7 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.FixmedinsCode = miConfig.Code
 			struct3502.Opter = roles.UserName
 			struct3502.RxFlag = "0"
-			struct3502.InvChgTime = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct3502.InvChgTime = time.Now().Format("2006-01-02")
 			struct3502.OrgName = miConfig.OrgName
 			struct3502.AccessKey = miConfig.AccessKey
 			struct3502.RequestUrl = miConfig.Url
@@ -548,7 +548,7 @@ func (c *HisApiController) DeleteXSandBG() {
 	for _, item := range drugs {
 		if item.IsPc == 1 && item.IsBg == 1 {
 			var struct3507 models.Struct3507
-			struct3507.FixmedinsBchno = ""
+			struct3507.FixmedinsBchno =
 			struct3507.InvDataType = "1"
 			struct3507.Opter = roles.UserName
 			struct3507.OrgName = miConfig.OrgName
@@ -615,28 +615,115 @@ func (c *HisApiController) ChangeDrug() {
 
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
+	var err []string
 	for _, item := range flows {
+		var res3 ResultSix
 		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
 			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
-			if prescription.OrderStatus == 2 { //已经结算
+			if prescription.OrderStatus == 2 {
+				//已经结算
 				//判断是否已经销售
 				if item.IsSale == 1 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+						result, result2  := ChangeStock(item.Count, item, miConfig, "107", roles)
+						saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
+						var respJSON3 map[string]interface{}
+						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						userJSONBytes3, _ := json.Marshal(respJSON3)
+						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						if res3.Infcode != -1{
+							item.IsChange = 1
+							item.Bchno = item.NewDrugWarehouseInfo.Bchno
+							service.SaveDF(item)
+						}else{
+							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+						}
 					}
 				} else { //没销售，
-					//进行商品销售接口
-					SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "", roles)
+					var res FJ3507Result
 
-					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+					//进行商品销售接口
+					result3, result4  := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles)
+					saveLog(result3, result4, "3505", "自动出库，未销售进行销售行为，3505")
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result3)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					if res.Infcode != -1 {
+						item.IsSale = 1
+						item.SaleDate = time.Now().Format("2006-01-02")
+						err5 := service.SaveDF(item)
+						if err5 == nil {
+							if item.IsChange == 0 { //没变更，进行变更操作
+								result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+								saveLog(result, result2, "3502", "自动出库，没销售，未变更3502")
+
+								var respJSON3 map[string]interface{}
+								if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+									utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+								userJSONBytes3, _ := json.Marshal(respJSON3)
+								if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+									utils.ErrorLog("解析失败：%v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+								if res3.Infcode != -1 {
+									item.IsChange = 1
+									item.Bchno = item.NewDrugWarehouseInfo.Bchno
+									service.SaveDF(item)
+								} else {
+									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+								}
+							}
+						}
+					}else{
+						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售失败："+res.ErrMsg)
 					}
 				}
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+					result, result2  :=ChangeStock(item.Count, item, miConfig, "107", roles)
+					saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					if res3.Infcode != -1{
+						item.IsChange = 1
+						item.Bchno = item.NewDrugWarehouseInfo.Bchno
+						service.SaveDF(item)
+					}else{
+						err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+					}
 				}
 			}
 		} else if item.ConsumableType == 7 {
@@ -648,97 +735,174 @@ func (c *HisApiController) ChangeDrug() {
 				if item.IsSale == 1 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+						result, result2  :=ChangeStock(item.Count, item, miConfig, "107", roles)
+						saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
+
+						var respJSON3 map[string]interface{}
+						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						userJSONBytes3, _ := json.Marshal(respJSON3)
+						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						if res3.Infcode != -1{
+							item.IsChange = 1
+							item.Bchno = item.NewDrugWarehouseInfo.Bchno
+							service.SaveDF(item)
+						}else{
+							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+						}
 					}
 				} else { //没销售，
 					//进行商品销售退货接口
-					CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "")
+					result111, result222 := CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "",roles)
+					saveLog(result111,result222,"3506","销售退货")
 					if item.IsChange == 0 { //没变更，进行变更操作
-						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+						result, result2  :=ChangeStock(item.Count, item, miConfig, "107", roles)
+						saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
+
+						var respJSON3 map[string]interface{}
+						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						userJSONBytes3, _ := json.Marshal(respJSON3)
+						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						if res3.Infcode != -1{
+							item.IsChange = 1
+							item.Bchno = item.NewDrugWarehouseInfo.Bchno
+							service.SaveDF(item)
+						}else{
+							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+						}
 					}
 				}
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+					result, result2  := ChangeStock(item.Count, item, miConfig, "107", roles)
+					saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
+
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					if res3.Infcode != -1{
+						item.IsChange = 1
+						item.Bchno = item.NewDrugWarehouseInfo.Bchno
+						service.SaveDF(item)
+					}else{
+						err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+					}
 
 				}
 			}
 
 		} else { //其他方式
 			if item.IsChange == 0 { //没变更，进行变更操作
-				ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102", roles)
+				result, result2  := ChangeStock(item.Count, item, miConfig, "107", roles)
+				saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
+
+				var respJSON3 map[string]interface{}
+				if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				userJSONBytes3, _ := json.Marshal(respJSON3)
+				if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				if res3.Infcode != -1{
+					item.IsChange = 1
+					item.Bchno = item.NewDrugWarehouseInfo.Bchno
+					service.SaveDF(item)
+				}else{
+					err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
+				}
 			}
 		}
 	}
 }
 
-func ChangeStock(count int64, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) {
+func ChangeStock(count int64, drug  *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) (string,string){
 	var struct3502 models.Struct3502
-	struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3502.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3502.FixmedinsHilistId = miConfig.Code
 	struct3502.FixmedinsHilistName = miConfig.OrgName
 	struct3502.FixmedinsCode = miConfig.Code
 	struct3502.Opter = role.UserName
 	struct3502.RxFlag = "0"
-	struct3502.InvChgTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	struct3502.InvChgTime =  time.Now().Format("2006-01-02")
 	struct3502.OrgName = miConfig.OrgName
 	struct3502.AccessKey = miConfig.AccessKey
 	struct3502.RequestUrl = miConfig.Url
 	struct3502.SecretKey = miConfig.SecretKey
 	struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
 	struct3502.Url = miConfig.Url
 	struct3502.AppId = miConfig.Cainfo
 	struct3502.AppSecret = miConfig.AppSecret
 	struct3502.Enckey = miConfig.EncKey
 	struct3502.SignKey = miConfig.SignKey
 	struct3502.SecretKey = miConfig.SecretKey
-
 	struct3502.InvChgType = chgType
-	struct3502.FixmedinsBchno = ""
+	struct3502.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
 	struct3502.Cnt = strconv.FormatInt(count, 10)
 	struct3502.Pric = fmt.Sprintf("%.2f", drug.Price)
-	result1, result2, result3 := service.FJyb3502(struct3502)
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-
+	result1, result2, _ := service.FJyb3502(struct3502)
+	return result1,result2
 }
-func SaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) {
+func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) (string, string){
 	var struct3505 models.Struct3505
-	struct3505.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3505.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3505.FixmedinsHilistId = miConfig.Code
 	struct3505.FixmedinsHilistName = miConfig.OrgName
+	struct3505.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+
 	struct3505.FixmedinsCode = miConfig.Code
-	struct3505.FixmedinsBchno = ""
 	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
-	struct3505.PrscDrName = roles.UserName
-	struct3505.PharName = ""
-	struct3505.PharPracCertNo = ""
+	struct3505.PrscDrName =roles.UserName
+	struct3505.PharName = "刘水山"
+	struct3505.PharPracCertNo = "2015026350260000002611351127"
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
-	struct3505.ManuLotnum = ""
-	struct3505.ManuDate = ""
+	struct3505.ManuLotnum = drug.Number
+	struct3505.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02 15:04:05")
 	struct3505.ExpyEnd = ""
 	struct3505.RxFlag = "0"
 	struct3505.TrdnFlag = "1"
-
+	struct3505.RtalDocno = order.Number
 	struct3505.Url = miConfig.Url
 	struct3505.AppId = miConfig.Cainfo
 	struct3505.AppSecret = miConfig.AppSecret
 	struct3505.Enckey = miConfig.EncKey
 	struct3505.SignKey = miConfig.SignKey
 	struct3505.SecretKey = miConfig.SecretKey
-
-	struct3505.RtalDocno = order.Number
-	strValue := fmt.Sprintf("%.2f", drug.PrescribingNumber)
+	strValue := fmt.Sprintf("%.2f", drug.HisDoctorAdviceInfo.PrescribingNumber)
 	struct3505.SelRetnCnt = strValue
-	struct3505.SelRetnTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
-	roles_two, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
-
-	struct3505.SelRetnOpterName = roles_two.UserName
+	struct3505.SelRetnTime = time.Unix(drug.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	struct3505.SelRetnOpterName = role.UserName
 	if order.IsMedicineInsurance == 1 {
 		struct3505.MdtrtSetlType = "1"
 	} else {
@@ -750,32 +914,30 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAd
 	struct3505.SecretKey = miConfig.SecretKey
 	struct3505.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 	struct3505.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-	result1, result2, result3 := service.FJyb3505(struct3505)
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
+	result1, result2, _ := service.FJyb3505(struct3505)
+	return result1,result2
 
 }
-func CancleSaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+func CancleSaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string,role models.UserAdminRole)  (string,string){
 	var struct3506 models.Struct3506
-	struct3506.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3506.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3506.FixmedinsHilistId = miConfig.Code
 	struct3506.FixmedinsHilistName = miConfig.OrgName
 	struct3506.FixmedinsCode = miConfig.Code
-	struct3506.FixmedinsBchno = ""
+	struct3506.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+	struct3506.Opter = role.UserName
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
-	//roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
-	struct3506.ManuLotnum = ""
-	struct3506.ManuDate = ""
+	struct3506.ManuLotnum = drug.NewDrugWarehouseInfo.Number
+	struct3506.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02")
 	struct3506.MdtrtSn = order.MdtrtId
 	struct3506.ExpyEnd = ""
 	struct3506.RxFlag = "0"
 	struct3506.TrdnFlag = "1"
-	strValue := fmt.Sprintf("%.2f", drug.PrescribingNumber)
+	strValue := fmt.Sprintf("%.2f", drug.HisDoctorAdviceInfo.PrescribingNumber)
 	struct3506.SelRetnCnt = strValue
-	struct3506.SelRetnTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
-	roles_two, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
-	struct3506.SelRetnOpterName = roles_two.UserName
+	struct3506.SelRetnTime = time.Unix(drug.HisDoctorAdviceInfo.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	//roles_two, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+	struct3506.SelRetnOpterName = role.UserName
 	struct3506.OrgName = miConfig.OrgName
 	struct3506.AccessKey = miConfig.AccessKey
 	struct3506.RequestUrl = miConfig.Url
@@ -789,12 +951,8 @@ func CancleSaleStock(org_id int64, pre models.HisPrescription, drug models.HisDo
 	struct3506.Enckey = miConfig.EncKey
 	struct3506.SignKey = miConfig.SignKey
 	struct3506.SecretKey = miConfig.SecretKey
-
-	result1, result2, result3 := service.FJyb3506(struct3506)
-	fmt.Println(result1)
-	fmt.Println(result2)
-	fmt.Println(result3)
-
+	result1, result2, _ := service.FJyb3506(struct3506)
+	return result1,result2
 }
 
 func (c *HisApiController) Get1318() {

models/new_stock_models.go

@@ -384,60 +384,63 @@ func (NewDrugCancelStockInfo) TableName() string {
 }
 
 type DrugFlow struct {
-	ID                        int64               `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId             int64               `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                    int64               `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                    string              `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber               string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                     int64               `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId                 int64               `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId                 int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime                int64               `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType            int64               `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                     int64               `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder          string              `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId            int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber   string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                    int64               `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId             int64               `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber         string              `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer              int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                    int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                   int64               `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator             int64               `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                    int64               `gorm:"column:status" json:"status" form:"status"`
-	Ctime                     int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                     int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                     float64             `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId       int64               `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId      int64               `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId         int64               `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ExpireDate                int64               `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate               int64               `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	MaxUnit                   string              `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                   string              `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber            int64               `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber            int64               `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	LastStockMaxNumber        int64               `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber        int64               `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	AdviceId                  int64               `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	HisDoctorAdviceInfo       HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
-	SupplyWarehouseId         int64               `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyCancelOutId         int64               `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseDetailInfo int64               `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64               `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64               `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId               int64               `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice                 float64             `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount                string              `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId                int64               `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	IsRead                    int64               `gorm:"column:is_read" json:"is_read" form:"is_read"`
-	IsCheck                   int64               `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	OverCount                 int64               `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	RetailPrice               float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	OrderId                   int64               `gorm:"column:order_id" json:"order_id" form:"order_id"`
-	IsSale                    int64               `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`
-	IsChange                  int64               `gorm:"column:is_change" json:"is_change" form:"is_change"`
+	ID                        int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string               `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64                `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64                `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64                `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64              `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64                `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64                `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64              `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64                `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsRead                    int64                `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                   int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount                 int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	OrderId                   int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	IsSale                    int64                `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`
+	IsChange                  int64                `gorm:"column:is_change" json:"is_change" form:"is_change"`
+	NewDrugWarehouseInfo      NewDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"dw"`
+	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 }
 
 func (DrugFlow) TableName() string {

service/his_service.go

@@ -1710,7 +1710,7 @@ func GetNewDrugWarehouseInfo(id_arr []string) (newDrugWarehouse []*models.NewDru
 
 func GetNewDrugFlowInfo(id_arr []string) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Where("org_id = ? and status = 1 and id in (?)", 10191, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1").Preload("NewDrugWarehouseInfo", "status = 1")
 	}).Find(&flows).Error
 	return
 }
@@ -1724,3 +1724,8 @@ func GetHisOrderByNumber(number string) (order models.HisOrder) {
 	err = readDb.Model(&models.HisOrder{}).Where("number = ? and status = 1", number).First(&order).Error
 	return
 }
+
+func SaveDF(df *models.DrugFlow) (err error) {
+	err = writeDb.Save(&df).Error
+	return
+}