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

controllers/sg/his_api_controller.go

@@ -643,7 +643,7 @@ func (c *HisApiController) ChangeDrug() {
 						if res3.Infcode != -1{
 							item.IsChange = 1
 							item.Bchno = item.NewDrugWarehouseInfo.Bchno
-							service.SaveDF(item)
+							service.SaveDF2(item)
 						}else{
 							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 						}
@@ -690,7 +690,7 @@ func (c *HisApiController) ChangeDrug() {
 								if res3.Infcode != -1 {
 									item.IsChange = 1
 									item.Bchno = item.NewDrugWarehouseInfo.Bchno
-									service.SaveDF(item)
+									service.SaveDF2(item)
 								} else {
 									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
 								}
@@ -720,7 +720,7 @@ func (c *HisApiController) ChangeDrug() {
 					if res3.Infcode != -1{
 						item.IsChange = 1
 						item.Bchno = item.NewDrugWarehouseInfo.Bchno
-						service.SaveDF(item)
+						service.SaveDF2(item)
 					}else{
 						err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 					}
@@ -735,7 +735,7 @@ 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)
+						result, result2  := ChangeStock(item.Count, item, miConfig, "107", roles)
 						saveLog(result, result2, "3502", "自动出库，未销售，未变更3502")
 
 						var respJSON3 map[string]interface{}
@@ -753,7 +753,7 @@ func (c *HisApiController) ChangeDrug() {
 						if res3.Infcode != -1{
 							item.IsChange = 1
 							item.Bchno = item.NewDrugWarehouseInfo.Bchno
-							service.SaveDF(item)
+							service.SaveDF2(item)
 						}else{
 							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 						}
@@ -781,7 +781,7 @@ func (c *HisApiController) ChangeDrug() {
 						if res3.Infcode != -1{
 							item.IsChange = 1
 							item.Bchno = item.NewDrugWarehouseInfo.Bchno
-							service.SaveDF(item)
+							service.SaveDF2(item)
 						}else{
 							err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 						}
@@ -807,7 +807,7 @@ func (c *HisApiController) ChangeDrug() {
 					if res3.Infcode != -1{
 						item.IsChange = 1
 						item.Bchno = item.NewDrugWarehouseInfo.Bchno
-						service.SaveDF(item)
+						service.SaveDF2(item)
 					}else{
 						err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 					}
@@ -835,7 +835,7 @@ func (c *HisApiController) ChangeDrug() {
 				if res3.Infcode != -1{
 					item.IsChange = 1
 					item.Bchno = item.NewDrugWarehouseInfo.Bchno
-					service.SaveDF(item)
+					service.SaveDF2(item)
 				}else{
 					err = append(err,item.HisDoctorAdviceInfo.AdviceName +",销售变更失败："+res3.ErrMsg)
 				}

service/his_service.go

@@ -1726,6 +1726,21 @@ func GetHisOrderByNumber(number string) (order models.HisOrder) {
 }
 
 func SaveDF(df *models.DrugFlow) (err error) {
-	err = writeDb.Save(&df).Error
+	//err = writeDb.(&df).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("id = ? ", df.ID).Updates(map[string]interface{}{
+		"is_sale":   df.IsSale,
+		"sale_date": df.SaleDate,
+		//"is_change"
+	}).Error
+	return
+}
+
+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,
+		//"is_change"
+	}).Error
 	return
 }