777

controllers/sg/his_api_controller.go

@@ -20,11 +20,10 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"github.com/go-ole/go-ole/oleutil"
 	"github.com/gorilla/websocket"
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
-	"github.com/go-ole/go-ole"
-	"github.com/go-ole/go-ole/oleutil"
 	"io"
 	"io/ioutil"
 	//"math"
@@ -215,7 +214,6 @@ func (c *HisApiController) Get3508() {
 
 	struct3508.FixmedinsCode = miConfig.Code
 
-
 	struct3508.AccessKey = miConfig.AccessKey
 	struct3508.Opter = curRoles.UserName
 	struct3508.RequestUrl = miConfig.Url
@@ -701,6 +699,7 @@ func (c *HisApiController) FJ3501AND3502() {
 				drug.PcDate = time.Now().Format("2006-01-02")
 				err := service.SaveW(drug)
 				if err == nil {
+					bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3502"
 					var struct3502 models.Struct3502
 					struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
 					struct3502.FixmedinsHilistId = miConfig.Code
@@ -723,7 +722,7 @@ func (c *HisApiController) FJ3501AND3502() {
 					struct3502.SecretKey = miConfig.SecretKey
 					struct3502.Memo = ""
 					struct3502.InvChgType = "108"
-					struct3502.FixmedinsBchno = drug.Bchno
+					struct3502.FixmedinsBchno = bg_number
 					struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 					struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 					result11, result22, _ := service.FJyb3502(struct3502)
@@ -749,6 +748,7 @@ func (c *HisApiController) FJ3501AND3502() {
 						})
 					} else {
 						drug.IsBg = 1
+						drug.BgBchno = bg_number
 						service.SaveW(drug)
 					}
 				}
@@ -760,6 +760,7 @@ func (c *HisApiController) FJ3501AND3502() {
 		//变更
 		if drug.IsPc == 1 && drug.IsBg == 0 {
 			var res3 ResultSix
+			bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3502"
 
 			var struct3502 models.Struct3502
 			struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
@@ -784,7 +785,7 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.SignKey = miConfig.SignKey
 			struct3502.SecretKey = miConfig.SecretKey
 
-			struct3502.FixmedinsBchno = drug.Bchno
+			struct3502.FixmedinsBchno = bg_number
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 			result1, result2, _ := service.FJyb3502(struct3502)
@@ -805,8 +806,7 @@ func (c *HisApiController) FJ3501AND3502() {
 				errs = append(errs, "变更"+drug.BaseDrugLib.DrugName+",出错:"+res3.ErrMsg)
 			} else {
 				drug.IsBg = 1
-				//drug.Bchno = number
-				//drug.PcDate = time.Now().Format("2006-01-02")
+				drug.BgBchno = bg_number
 				service.SaveW(drug)
 			}
 		}
@@ -890,7 +890,7 @@ func (c *HisApiController) DeletePCandBG() {
 					struct3507_2.Enckey = miConfig.EncKey
 					struct3507_2.SignKey = miConfig.SignKey
 					struct3507_2.SecretKey = miConfig.SecretKey
-					struct3507_2.FixmedinsBchno = item.Bchno
+					struct3507_2.FixmedinsBchno = item.BgBchno
 					struct3507_2.InvDataType = "2"
 					result11, result22, _ := service.FJyb3507(struct3507_2)
 					saveLog(result11, result22, "3507", "3507")
@@ -910,6 +910,7 @@ func (c *HisApiController) DeletePCandBG() {
 					if res2.Infcode != -1 {
 						item.IsBg = 0
 						item.Bchno = ""
+						item.BgBchno = ""
 						item.PcDate = ""
 						service.SaveW(item)
 					} else {
@@ -926,6 +927,52 @@ func (c *HisApiController) DeletePCandBG() {
 			var res FJ3507Result
 			var struct3507 models.Struct3507
 			struct3507.FixmedinsBchno = item.Bchno
+			struct3507.InvDataType = "1"
+			struct3507.Opter = roles.UserName
+			struct3507.FixmedinsCode = miConfig.Code
+			struct3507.OrgName = miConfig.OrgName
+			struct3507.AccessKey = miConfig.AccessKey
+			struct3507.RequestUrl = miConfig.Url
+			struct3507.SecretKey = miConfig.SecretKey
+			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			struct3507.Url = miConfig.Url
+			struct3507.AppId = miConfig.Cainfo
+			struct3507.AppSecret = miConfig.AppSecret
+			struct3507.Enckey = miConfig.EncKey
+			struct3507.SignKey = miConfig.SignKey
+			struct3507.SecretKey = miConfig.SecretKey
+			result, result1, _ := service.FJyb3507(struct3507)
+			saveLog(result, result1, "3507", "3507")
+
+			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, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode != -1 {
+				item.IsPc = 0
+				item.Bchno = ""
+				item.BgBchno = ""
+				item.PcDate = ""
+				service.SaveW(item)
+			} else {
+				err = append(err, "删除"+item.BaseDrugLib.DrugName+"盘存失败,失败原因："+res.ErrMsg)
+			}
+		}
+
+		if item.IsPc == 0 && item.IsBg == 1 {
+
+			var res FJ3507Result
+			var struct3507 models.Struct3507
+			struct3507.FixmedinsBchno = item.BgBchno
 			struct3507.InvDataType = "2"
 			struct3507.Opter = roles.UserName
 			struct3507.FixmedinsCode = miConfig.Code
@@ -959,6 +1006,7 @@ func (c *HisApiController) DeletePCandBG() {
 			if res.Infcode != -1 {
 				item.IsBg = 0
 				item.Bchno = ""
+				item.BgBchno = ""
 				item.PcDate = ""
 				service.SaveW(item)
 			} else {
@@ -981,6 +1029,7 @@ func (c *HisApiController) DeletePCandBG() {
 	}
 
 }
+
 func (c *HisApiController) DeleteXSandBG() {
 	ids := c.GetString("ids")
 	id_arr := strings.Split(ids, ",")
@@ -1032,6 +1081,8 @@ func (c *HisApiController) DeleteXSandBG() {
 			if res.Infcode != -1 {
 				item.IsSale = 0
 				item.SaleDate = ""
+				item.Bchno = ""
+
 				err2 := service.SaveDF(item)
 				if err2 == nil {
 					var struct3507_2 models.Struct3507
@@ -1050,7 +1101,7 @@ func (c *HisApiController) DeleteXSandBG() {
 					struct3507_2.Enckey = miConfig.EncKey
 					struct3507_2.SignKey = miConfig.SignKey
 					struct3507_2.SecretKey = miConfig.SecretKey
-					struct3507_2.FixmedinsBchno = item.Bchno
+					struct3507_2.FixmedinsBchno = item.BgBchno
 					struct3507_2.InvDataType = "2"
 					result11, result22, _ := service.FJyb3507(struct3507_2)
 					saveLog(result11, result22, "3507", "3507")
@@ -1069,7 +1120,7 @@ func (c *HisApiController) DeleteXSandBG() {
 					}
 					if res2.Infcode != -1 {
 						item.IsChange = 0
-						item.Bchno = ""
+						item.BgBchno = ""
 						service.SaveDF2(item)
 					} else {
 						err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
@@ -1120,6 +1171,7 @@ func (c *HisApiController) DeleteXSandBG() {
 			if res.Infcode != -1 {
 				item.IsSale = 0
 				item.SaleDate = ""
+				item.Bchno = ""
 				err2 := service.SaveDF(item)
 				if err2 == nil {
 					var struct3507_2 models.Struct3507
@@ -1128,7 +1180,6 @@ func (c *HisApiController) DeleteXSandBG() {
 					struct3507_2.RequestUrl = miConfig.Url
 					struct3507_2.Opter = roles.UserName
 					struct3507_2.FixmedinsCode = miConfig.Code
-
 					struct3507_2.SecretKey = miConfig.SecretKey
 					struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 					struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
@@ -1138,11 +1189,10 @@ func (c *HisApiController) DeleteXSandBG() {
 					struct3507_2.Enckey = miConfig.EncKey
 					struct3507_2.SignKey = miConfig.SignKey
 					struct3507_2.SecretKey = miConfig.SecretKey
-					struct3507_2.FixmedinsBchno = item.Bchno
+					struct3507_2.FixmedinsBchno = item.BgBchno
 					struct3507_2.InvDataType = "2"
 					result11, result22, _ := service.FJyb3507(struct3507_2)
 					saveLog(result11, result22, "3507", "3507")
-
 					var respJSON3 map[string]interface{}
 					if err := json.Unmarshal([]byte(string(result11)), &respJSON3); err != nil {
 						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -1157,7 +1207,7 @@ func (c *HisApiController) DeleteXSandBG() {
 					}
 					if res2.Infcode != -1 {
 						item.IsChange = 0
-						item.Bchno = ""
+						item.BgBchno = ""
 						service.SaveDF2(item)
 					} else {
 						err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
@@ -1249,6 +1299,8 @@ func (c *HisApiController) DeleteXSandBG() {
 			if res.Infcode != -1 {
 				item.IsSale = 0
 				item.SaleDate = ""
+				item.Bchno = ""
+
 				service.SaveDF(item)
 			} else {
 				err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
@@ -1258,7 +1310,7 @@ func (c *HisApiController) DeleteXSandBG() {
 
 			var res FJ3507Result
 			var struct3507 models.Struct3507
-			struct3507.FixmedinsBchno = item.Bchno
+			struct3507.FixmedinsBchno = item.BgBchno
 			struct3507.InvDataType = "2"
 			struct3507.Opter = roles.UserName
 			struct3507.FixmedinsCode = miConfig.Code
@@ -1291,7 +1343,7 @@ func (c *HisApiController) DeleteXSandBG() {
 			}
 			if res.Infcode != -1 {
 				item.IsChange = 0
-				item.Bchno = ""
+				item.BgBchno = ""
 				service.SaveDF2(item)
 			} else {
 				err = append(err, "删除"+item.HisDoctorAdviceInfo.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
@@ -1325,8 +1377,6 @@ func (c *HisApiController) ChangeDrug() {
 	for _, item := range flows {
 		var res3 ResultSix
 		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
-			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3507"
-
 			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
 			if prescription.OrderStatus == 2 {
 				//已经结算
@@ -1334,7 +1384,9 @@ func (c *HisApiController) ChangeDrug() {
 				if item.IsSale == 1 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+						bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+						result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 						saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
 						var respJSON3 map[string]interface{}
 						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
@@ -1350,7 +1402,7 @@ func (c *HisApiController) ChangeDrug() {
 						}
 						if res3.Infcode != -1 {
 							item.IsChange = 1
-							item.Bchno = item.NewDrugWarehouseInfo.Bchno
+							item.BgBchno = bg_number
 							service.SaveDF2(item)
 						} else {
 							err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1358,9 +1410,10 @@ func (c *HisApiController) ChangeDrug() {
 					}
 				} else { //没销售，
 					var res FJ3507Result
+					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3505"
 
 					//进行商品销售接口
-					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles)
+					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
 					saveLog(result3, result4, "3505", "自动出库，未销售进行销售行为，3505")
 					var respJSON3 map[string]interface{}
 					if err := json.Unmarshal([]byte(string(result3)), &respJSON3); err != nil {
@@ -1376,11 +1429,15 @@ func (c *HisApiController) ChangeDrug() {
 					}
 					if res.Infcode != -1 {
 						item.IsSale = 1
+						item.Bchno = number
 						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)
+								bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+								result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 								saveLog(result, result2, "3502", "自动出库，没销售，未变更3502")
 
 								var respJSON3 map[string]interface{}
@@ -1397,7 +1454,7 @@ func (c *HisApiController) ChangeDrug() {
 								}
 								if res3.Infcode != -1 {
 									item.IsChange = 1
-									item.Bchno = item.NewDrugWarehouseInfo.Bchno
+									item.BgBchno = bg_number
 									service.SaveDF2(item)
 								} else {
 									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1411,7 +1468,9 @@ func (c *HisApiController) ChangeDrug() {
 
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+					bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+					result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 					saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
 					var respJSON3 map[string]interface{}
@@ -1428,7 +1487,7 @@ func (c *HisApiController) ChangeDrug() {
 					}
 					if res3.Infcode != -1 {
 						item.IsChange = 1
-						item.Bchno = item.NewDrugWarehouseInfo.Bchno
+						item.BgBchno = bg_number
 						service.SaveDF2(item)
 					} else {
 						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1443,7 +1502,9 @@ func (c *HisApiController) ChangeDrug() {
 				if item.IsSale == 2 { //是否已经销售，1是   0否
 					//是否已经变更 1是  0否
 					if item.IsChange == 0 { //没变更，进行变更操作
-						result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+						bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+						result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 						saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
 						var respJSON3 map[string]interface{}
@@ -1460,7 +1521,7 @@ func (c *HisApiController) ChangeDrug() {
 						}
 						if res3.Infcode != -1 {
 							item.IsChange = 1
-							item.Bchno = item.NewDrugWarehouseInfo.Bchno
+							item.BgBchno = bg_number
 							service.SaveDF2(item)
 						} else {
 							err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1468,13 +1529,15 @@ func (c *HisApiController) ChangeDrug() {
 					}
 				} else { //没销售，
 					//进行商品销售退货接口
-					result111, result222 := CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles)
+					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3506"
+
+					result111, result222 := CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
 					saveLog(result111, result222, "3506", "销售退货")
 					var res7 FJ3507Result
 
 					//进行商品销售接口
-					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles)
-					saveLog(result3, result4, "3506", "自动退库，未销售退货进行销售退货行为，3505")
+					//result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles,number)
+					//saveLog(result3, result4, "3506", "自动退库，未销售退货进行销售退货行为，3505")
 					var respJSON3 map[string]interface{}
 					if err := json.Unmarshal([]byte(string(result111)), &respJSON3); err != nil {
 						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -1490,9 +1553,12 @@ func (c *HisApiController) ChangeDrug() {
 					if res7.Infcode != -1 {
 						item.IsSale = 2
 						item.SaleDate = item.SaleDate
+						item.Bchno = number
 						service.SaveDF(item)
 						if item.IsChange == 0 { //没变更，进行变更操作
-							result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+							bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+							result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 							saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
 							var respJSON3 map[string]interface{}
@@ -1509,7 +1575,7 @@ func (c *HisApiController) ChangeDrug() {
 							}
 							if res3.Infcode != -1 {
 								item.IsChange = 1
-								item.Bchno = item.NewDrugWarehouseInfo.Bchno
+								item.BgBchno = bg_number
 								service.SaveDF2(item)
 							} else {
 								err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1521,7 +1587,9 @@ func (c *HisApiController) ChangeDrug() {
 				}
 			} else { //还没结算
 				if item.IsChange == 0 { //没变更，进行变更操作
-					result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles)
+					bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+					result, result2 := ChangeStock(item.Count, item, miConfig, "107", roles, bg_number)
 					saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
 					var respJSON3 map[string]interface{}
@@ -1538,7 +1606,7 @@ func (c *HisApiController) ChangeDrug() {
 					}
 					if res3.Infcode != -1 {
 						item.IsChange = 1
-						item.Bchno = item.NewDrugWarehouseInfo.Bchno
+						item.BgBchno = bg_number
 						service.SaveDF2(item)
 					} else {
 						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
@@ -1546,32 +1614,6 @@ func (c *HisApiController) ChangeDrug() {
 				}
 			}
 		}
-		//else { //其他方式
-		//	//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.SaveDF2(item)
-		//	//	}else{
-		//	//		err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
-		//	//	}
-		//	//}
-		//}
 	}
 	if len(err) == 0 {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1584,7 +1626,7 @@ func (c *HisApiController) ChangeDrug() {
 		})
 	}
 }
-func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) (string, string) {
+func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
 	var struct3502 models.Struct3502
 	struct3502.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3502.FixmedinsHilistId = miConfig.Code
@@ -1606,18 +1648,18 @@ func ChangeStock(count int64, drug *models.DrugFlow, miConfig models.MedicalInsu
 	struct3502.SignKey = miConfig.SignKey
 	struct3502.SecretKey = miConfig.SecretKey
 	struct3502.InvChgType = chgType
-	struct3502.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+	struct3502.FixmedinsBchno = number
 	struct3502.Cnt = strconv.FormatInt(count, 10)
 	struct3502.Pric = fmt.Sprintf("%.2f", drug.Price)
 	result1, result2, _ := service.FJyb3502(struct3502)
 	return result1, result2
 }
-func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) (string, string) {
+func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
 	var struct3505 models.Struct3505
 	struct3505.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3505.FixmedinsHilistId = miConfig.Code
 	struct3505.FixmedinsHilistName = miConfig.OrgName
-	struct3505.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+	struct3505.FixmedinsBchno = number
 	struct3505.Opter = role.UserName
 
 	struct3505.FixmedinsCode = miConfig.Code
@@ -1659,13 +1701,13 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	return result1, result2
 
 }
-func CancleSaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole) (string, string) {
+func CancleSaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow, miConfig models.MedicalInsuranceOrgConfig, chgType string, role models.UserAdminRole, number string) (string, string) {
 	var struct3506 models.Struct3506
 	struct3506.MedListCodg = drug.HisDoctorAdviceInfo.BaseDrugLib.MedicalInsuranceNumber
 	struct3506.FixmedinsHilistId = miConfig.Code
 	struct3506.FixmedinsHilistName = miConfig.OrgName
 	struct3506.FixmedinsCode = miConfig.Code
-	struct3506.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+	struct3506.FixmedinsBchno = number
 	struct3506.Opter = role.UserName
 	order := service.GetHisOrderByNumber(pre.BatchNumber)
 	struct3506.ManuLotnum = drug.NewDrugWarehouseInfo.Number

models/new_stock_models.go

@@ -261,10 +261,11 @@ type NewDrugWarehouseInfo struct {
 	SecondWarehouseInfoId     int64  `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 
-	IsPc   int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
-	IsBg   int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
-	Bchno  string `gorm:"column:bchno" json:"bchno" form:"bchno"`
-	PcDate string `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	IsPc    int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg    int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	Bchno   string `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	PcDate  string `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	BgBchno string `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
 }
 
 func (NewDrugWarehouseInfo) TableName() string {
@@ -441,6 +442,7 @@ type DrugFlow struct {
 	NewDrugWarehouseInfo      NewDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId" json:"dw"`
 	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
+	BgBchno                   string               `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
 }
 
 func (DrugFlow) TableName() string {

service/his_service.go

@@ -1730,6 +1730,7 @@ func SaveDF(df *models.DrugFlow) (err error) {
 	err = XTWriteDB().Model(&models.DrugFlow{}).Where("id = ? ", df.ID).Updates(map[string]interface{}{
 		"is_sale":   df.IsSale,
 		"sale_date": df.SaleDate,
+		"bchno":     df.Bchno,
 		//"is_change"
 	}).Error
 	return
@@ -1739,7 +1740,7 @@ func SaveDF2(df *models.DrugFlow) (err error) {
 	//err = writeDb.(&df).Error
 	err = XTWriteDB().Model(&models.DrugFlow{}).Where("id = ? ", df.ID).Updates(map[string]interface{}{
 		"is_change": df.IsChange,
-		"bchno":     df.Bchno,
+		"bg_bchno":  df.BgBchno,
 		//"is_change"
 	}).Error
 	return
@@ -1749,8 +1750,7 @@ func GetDrugByID(drug_id int64) (drug models.BaseDrugLib, err error) {
 	return
 }
 
-
-func GetBbx01ByTeamID(team_id int64)(team models.XtHisProjectTeam){
+func GetBbx01ByTeamID(team_id int64) (team models.XtHisProjectTeam) {
 	err = readDb.Model(&models.XtHisProjectTeam{}).Where("id = ?", team_id).First(&team).Error
 	return
 }