11月8日库存管理

controllers/base_api_controller.go

@@ -2,15 +2,10 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
-	"encoding/json"
-	"os"
-	"path"
-	"runtime"
+	"fmt"
 	"strconv"
 	"strings"
-	"time"
 )
 
 type BaseAPIController struct {
@@ -74,72 +69,56 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 10215
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10215
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
 
 	if this.Ctx.Request.Header.Get("Permission") == "2" {
-		err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
-
 		org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
 		if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
 
 			isPermission := false
 			adminUserInfo := this.GetAdminUserInfo()
-
-			redisClient := service.RedisClient()
-			defer redisClient.Close()
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
-			result, _ := redisClient.Get(key).Result()
-			var role models.App_Role
+			//该机构下该用户有多少个
+			role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
 			var roles []string
-			if len(result) == 0 {
-				//该机构下该用户有多少个
-				role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
-				redisClient.Set(key, role, time.Second*60*60*18)
-				if len(role.RoleIds) > 0 { //该用户没有设置角色
-					roles = strings.Split(role.RoleIds, ",")
-				}
+			if len(role.RoleIds) <= 0 { //该用户没有设置角色
+
 			} else {
-				json.Unmarshal([]byte(result), &role)
-				if len(role.RoleIds) > 0 { //该用户没有设置角色
-					roles = strings.Split(role.RoleIds, ",")
-				}
+				roles = strings.Split(role.RoleIds, ",")
 			}
-
-			//key := strconv.FormatInt(role_id, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
-			//result, _ := redisClient.Get(key).Result()
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -155,7 +134,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-
+			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -176,13 +155,7 @@ func (this *BaseAuthAPIController) Prepare() {
 						}
 					}
 					if !isPermission {
-						var msg string
-						for _, item := range err_msgs {
-							if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
-								msg = item.ErrMsg
-							}
-						}
-						//msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+						msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 						json := make(map[string]interface{})
 						json["msg"] = msg
 						json["code"] = 0
@@ -192,39 +165,25 @@ func (this *BaseAuthAPIController) Prepare() {
 						this.StopRun()
 					}
 				}
-
 			}
 		}
 	}
 
 	if this.Ctx.Request.Header.Get("Permission") == "3" {
-		err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
-
 		org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
 		if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
 
 			isPermission := false
 			adminUserInfo := this.GetAdminUserInfo()
 			//该机构下该用户有多少个
-			redisClient := service.RedisClient()
-			defer redisClient.Close()
-			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
-			result, _ := redisClient.Get(key).Result()
-			var role models.App_Role
+			role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
 			var roles []string
-			if len(result) == 0 {
-				//该机构下该用户有多少个
-				role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
-				redisClient.Set(key, role, time.Second*60*60*18)
-				if len(role.RoleIds) > 0 { //该用户没有设置角色
-					roles = strings.Split(role.RoleIds, ",")
-				}
+			if len(role.RoleIds) <= 0 { //该用户没有设置角色
+
 			} else {
-				json.Unmarshal([]byte(result), &role)
-				if len(role.RoleIds) > 0 { //该用户没有设置角色
-					roles = strings.Split(role.RoleIds, ",")
-				}
+				roles = strings.Split(role.RoleIds, ",")
 			}
+			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -240,6 +199,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -258,13 +218,7 @@ func (this *BaseAuthAPIController) Prepare() {
 						}
 					}
 					if !isPermission {
-						var msg string
-						for _, item := range err_msgs {
-							if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
-								msg = item.ErrMsg
-							}
-						}
-						//msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+						msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 						json := make(map[string]interface{})
 						json["msg"] = msg
 						json["code"] = 0
@@ -361,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
-
-		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
-		userAdmin.IsSuperAdmin = false
-		userAdmin.Status = 1
-		userAdmin.CreateTime = 1530786071
-		userAdmin.ModifyTime = 1530786071
-		var subscibe models.ServeSubscibe
-		subscibe.ID = 1
-		subscibe.OrgId = 10215
-		subscibe.PeriodStart = 1538035409
-		subscibe.PeriodEnd = 1569571409
-		subscibe.State = 1
-		subscibe.Status = 1
-		subscibe.CreatedTime = 1538035409
-		subscibe.UpdatedTime = 1538035409
-		subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		subscibes[4] = &subscibe
-		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10215
-		adminUserInfo.CurrentAppId = 4
-		adminUserInfo.AdminUser = &userAdmin
-		adminUserInfo.Subscibes = subscibes
-		this.SetSession("admin_user_info", &adminUserInfo)
-		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		//this.StopRun()
+		//var userAdmin models.AdminUser
+		//userAdmin.Id = 1448
+		//userAdmin.Mobile = "13318599895"
+		//
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		//userAdmin.IsSuperAdmin = false
+		//userAdmin.Status = 1
+		//userAdmin.CreateTime = 1530786071
+		//userAdmin.ModifyTime = 1530786071
+		//var subscibe models.ServeSubscibe
+		//subscibe.ID = 1
+		//subscibe.OrgId = 3877
+		//subscibe.PeriodStart = 1538035409
+		//subscibe.PeriodEnd = 1569571409
+		//subscibe.State = 1
+		//subscibe.Status = 1
+		//subscibe.CreatedTime = 1538035409
+		//subscibe.UpdatedTime = 1538035409
+		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		//subscibes[4] = &subscibe
+		//var adminUserInfo service.AdminUserInfo
+		//adminUserInfo.CurrentOrgId = 3877
+		//adminUserInfo.CurrentAppId = 4
+		//adminUserInfo.AdminUser = &userAdmin
+		//adminUserInfo.Subscibes = subscibes
+		//this.SetSession("admin_user_info", &adminUserInfo)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {
@@ -426,33 +380,3 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	}
 	return
 }
-
-type ErrMsgConfig struct {
-	Msgs []*models.ErrMsg "json:msg"
-}
-
-func LoadErrMsgConfig(dataFile string) *ErrMsgConfig {
-	var config ErrMsgConfig
-	_, filename, _, _ := runtime.Caller(1)
-	datapath := path.Join(path.Dir(filename), dataFile)
-	config_file, err := os.Open(datapath)
-	if err != nil {
-		emit("Failed to open config file '%s': %s\n", datapath, err)
-		return &config
-	}
-	fi, _ := config_file.Stat()
-	buffer := make([]byte, fi.Size())
-	_, err = config_file.Read(buffer)
-	buffer, err = StripComments(buffer) //去掉注释
-	if err != nil {
-		emit("Failed to strip comments from json: %s\n", err)
-		return &config
-	}
-	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
-	err = json.Unmarshal(buffer, &config)         //解析json格式数据
-	if err != nil {
-		emit("Failed unmarshalling json: %s\n", err)
-		return &config
-	}
-	return &config
-}

controllers/device_api_controller.go

@@ -883,6 +883,17 @@ func (this *DeviceAPIController) ModifyNumber() {
 		return
 	}
 	updateErr := service.UpdateDeviceNumber(number)
+
+	//查询该床位是否绑定设备
+	_, errcode := service.GetAddMacherByBedId(id, adminInfo.CurrentOrgId)
+	if errcode == nil {
+		//修改设备管理机器分区
+		addmacher := models.DeviceAddmacher{
+			ZoneId: zoneID,
+		}
+		service.UpdateAddmacherByBedId(id, addmacher)
+	}
+
 	if updateErr != nil {
 		this.ErrorLog("修改机号失败:%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
@@ -1135,17 +1146,11 @@ func (this *DeviceAPIController) GetAllSubregion() {
 func (this *DeviceAPIController) GetAllMachineInfo() {
 
 	page, _ := this.GetInt64("page")
-	fmt.Println("page是什么", page)
 	limit, _ := this.GetInt64("limit")
-	fmt.Println("limit是什么", limit)
 	searchKey := this.GetString("searchKey")
-	fmt.Println("searcheKey", searchKey)
 	zoneid, _ := this.GetInt64("zoneid")
-	fmt.Println("区号id", zoneid)
 	equipmentid, _ := this.GetInt64("equipmentid")
-	fmt.Println("equipmentid", equipmentid)
 	statusid, _ := this.GetInt64("statusid")
-	fmt.Println("statusid", statusid)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 	addmahcer, total, err := service.GetAllMachineInfo(page, limit, searchKey, zoneid, equipmentid, statusid, orgid)

controllers/dialysis_api_controller.go

@@ -1845,10 +1845,15 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		treatmentSummary.Modifier = adminUserInfo.AdminUser.Id
 		treatmentSummary.ID = tempTreatmentSummary.ID
 		err := service.UpdateSummeRecord(&treatmentSummary)
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summarys_list_all"
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		//清空key 值
 		redis := service.RedisClient()
 		redis.Set(key, "", time.Second)
+		redis.Set(keyOne, "", time.Second)
+		redis.Set(keyThree, "", time.Second)
 		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -2725,7 +2730,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	patientInfo, _ := service.FindPatientWithDeviceByNo(adminUserInfo.CurrentOrgId, xtno, xttime)
 
 	//透析单
-	dialysisOrder, _ := service.MobileGetSchedualDialysisRecord(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	dialysisOrder, _ := service.MobileGetSchedualDialysisRecordTen(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	if dialysisOrder != nil {
 		if dialysisOrder.FinishNurse > 0 {
 			operatorIDs = append(operatorIDs, dialysisOrder.FinishNurse)

controllers/drug_stock_api_contorller.go

@@ -52,7 +52,6 @@ func DrugStockManagerApiRegistRouters() {
 	beego.Router("/api/drugcancelstock/delete", &StockDrugApiController{}, "post:DeleteDrugCancelStock")
 	beego.Router("/api/drugcancelstockinfo/delete", &StockDrugApiController{}, "post:DeleteDrugCancelStockInfo")
 	beego.Router("/api/drugcancelstockinfo/edit", &StockDrugApiController{}, "post:EditDrugCancelStock")
-	//beego.Router("/api/drugcancelstockinfo/config", &StockDrugApiController{}, "get:GetDrugCancelStockConfig")
 
 	////库存相关全局配置
 	beego.Router("/api/drugstock/config", &StockDrugApiController{}, "get:GetAllConfig")
@@ -93,9 +92,9 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 	timeArr := strings.Split(timeStr, "-")
 	total, _ := service.FindAllWarehouseTotalOne(adminUserInfo.CurrentOrgId)
 	total = total + 1
-	fmt.Println("total2323232323232", total)
+
 	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-	fmt.Println("r入库单据好  2323232322223", warehousing_order)
+
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 	warehousing := models.DrugWarehouse{
@@ -285,6 +284,10 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 			service.UpdateBaseDrug(&lib, item.DrugId)
 		}
 	}
+	for _, items := range drugFlow {
+		drugWarehouseInfo, _ := service.GetLastDrugWarehouseInfo(items.DrugId)
+		items.WarehousingDetailId = drugWarehouseInfo.ID
+	}
 	//创建流水单
 	service.CreateDrugFlow(drugFlow)
 
@@ -633,26 +636,27 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			for _, it := range warehousingInfo {
 				info, _ := service.GetLastDrugWarehouseInfSix(it.DrugId)
 				flows := models.DrugFlow{
-					WarehousingOrder: info.WarehousingOrder,
-					WarehousingId:    info.WarehousingId,
-					DrugId:           info.DrugId,
-					Number:           info.Number,
-					ProductDate:      info.ProductDate,
-					ExpireDate:       info.ExpiryDate,
-					Count:            info.WarehousingCount,
-					Price:            info.Price,
-					Status:           1,
-					Ctime:            ctime,
-					UserOrgId:        adminUserInfo.CurrentOrgId,
-					Manufacturer:     info.Manufacturer,
-					Dealer:           info.Dealer,
-					BatchNumber:      info.BatchNumber,
-					MaxUnit:          info.MaxUnit,
-					MinUnit:          "",
-					ConsumableType:   1,
-					IsEdit:           1,
-					Creator:          adminUserInfo.AdminUser.Id,
-					IsSys:            0,
+					WarehousingOrder:    info.WarehousingOrder,
+					WarehousingId:       info.WarehousingId,
+					DrugId:              info.DrugId,
+					Number:              info.Number,
+					ProductDate:         info.ProductDate,
+					ExpireDate:          info.ExpiryDate,
+					Count:               info.WarehousingCount,
+					Price:               info.Price,
+					Status:              1,
+					Ctime:               ctime,
+					UserOrgId:           adminUserInfo.CurrentOrgId,
+					Manufacturer:        info.Manufacturer,
+					Dealer:              info.Dealer,
+					BatchNumber:         info.BatchNumber,
+					MaxUnit:             info.MaxUnit,
+					MinUnit:             "",
+					ConsumableType:      1,
+					IsEdit:              1,
+					Creator:             adminUserInfo.AdminUser.Id,
+					IsSys:               0,
+					WarehousingDetailId: info.ID,
 				}
 				_, existerrcodes := service.GetDrugFlowIsExist(info.ID, info.DrugId)
 
@@ -673,8 +677,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			//查询修改的记录
 			orderInfo, _ := service.GetDrugWarehouseOrderOne(id, item.DrugId)
 
-			fmt.Println("hh23323232323232332233232", orderInfo)
-
 			info, _ := service.FindeDrugInfo(item.DrugId)
 
 			//历史入库总数
@@ -711,7 +713,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			}
 
 			warehouseInfo, _ := service.FindeLastWarehouseInfo(item.ID)
-			fmt.Println("hhhhh23hh32h232332323223", warehouseInfo)
+
 			var total int64
 
 			//比较大小(加)
@@ -722,11 +724,15 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
-						fmt.Println(it)
 						flow := models.DrugFlow{
-							Count: item.StockMaxNumber,
+							Count:        item.StockMaxNumber,
+							Manufacturer: it.Manufacturer,
+							Dealer:       it.Dealer,
+							Number:       it.Number,
+							BatchNumber:  it.BatchNumber,
+							Price:        it.Price,
 						}
-						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						parseDateErr := service.UpdateDrugFlowTen(flow, item.DrugId, warehouseInfo.WarehousingId)
 						fmt.Println(parseDateErr)
 
 					}
@@ -808,6 +814,7 @@ func (c *StockDrugApiController) DeleteDrugWarehouseInfo() {
 	}
 
 	err := service.UpDateDrugWarehouseStatus(id)
+	service.UpdateDrugFlowById(id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1336,28 +1343,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-				//drugflow := &models.DrugFlow{
-				//	WarehouseOutId:          warehouseOut.ID,
-				//	WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				//	DrugId:                  drug_id,
-				//	Number:                  number,
-				//	ProductDate:             productDates,
-				//	ExpireDate:              expiryDates,
-				//	Count:                   count,
-				//	Price:                   price,
-				//	Status:                  1,
-				//	Ctime:                   ctime,
-				//	UserOrgId:               adminUserInfo.CurrentOrgId,
-				//	Manufacturer:            manufacturer,
-				//	Dealer:                  dealer,
-				//	BatchNumber:             batch_number,
-				//	MaxUnit:                 max_unit,
-				//	ConsumableType:          2,
-				//	IsEdit:                  1,
-				//	Creator:                 adminUserInfo.AdminUser.Id,
-				//	IsSys:                   0,
-				//}
-				//drugFlow = append(drugFlow, drugflow)
 			}
 		}
 	}
@@ -1384,10 +1369,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			prescribing_number_total = item.Count
 		}
 
-		fmt.Println("药品ID", item.DrugId)
-		fmt.Println("数量一", prescribing_number_total)
-		fmt.Println("数量二", total_count)
-
 		//判断单位
 		if total_count == 0 {
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
@@ -1535,6 +1516,7 @@ func (this *StockDrugApiController) DeleteDrugWarehouseOutInfo() {
 	}
 
 	err := service.UpDateDrugWarehouseOutStatus(id)
+	service.DeleteDrugWarehouseOutInfoById(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1675,6 +1657,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					}
 
 				}
+
 				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
 					productDates = 0
 				} else {
@@ -1838,8 +1821,6 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				prescribing_number_total = item.Count
 			}
 
-			fmt.Println("数量一", prescribing_number_total)
-			fmt.Println("数量二", total_count)
 			//判断单位
 			if total_count == 0 {
 				goodObj, _ := service.GetDrugByGoodId(item.DrugId)
@@ -1868,8 +1849,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				})
 				return
 			} else {
-				//errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-				//service.CreateDrugFlow(drugFlow)
+
 				// 出库流程
 				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1906,8 +1886,6 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				min_number = outInfo.Count
 			}
 
-			fmt.Println("单位1", medical.MaxUnit)
-			fmt.Println("单位2", item.CountUnit)
 			if medical.MaxUnit == item.CountUnit {
 				max_number = item.Count * medical.MinNumber
 			}
@@ -1918,11 +1896,18 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 			all_number = info.Count*medical.MinNumber + info.StockMinNumber
 
-			////比较当前出库数量 和 最后一次出库数量,正常出库
+			////比较当前出库数量 和 最后一次出库数量,正常退库
 			if max_number <= min_number {
 				errs = service.UpDateDrugWarehouseOutInfo(item)
 				flow := models.DrugFlow{
-					Count: item.Count,
+					Count:          max_number,
+					ExpireDate:     item.ExpiryDate,
+					ProductDate:    item.ProductDate,
+					Price:          item.Price,
+					Manufacturer:   item.Manufacturer,
+					Dealer:         item.Dealer,
+					Number:         item.Number,
+					WarehouseOutId: item.WarehouseOutId,
 				}
 				service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
 				cha_number = min_number - max_number
@@ -1986,19 +1971,25 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 			//退库操作
 			if max_number > min_number {
 
-				cha_number = min_number - max_number
+				cha_number = max_number - min_number
 				//如果总库存大于差,正常出库
 				if all_number > cha_number {
 
 					errs = service.UpDateDrugWarehouseOutInfo(item)
 					flow := models.DrugFlow{
-						Count: item.Count,
+						Count:        max_number,
+						ExpireDate:   item.ExpiryDate,
+						ProductDate:  item.ProductDate,
+						Price:        item.Price,
+						Manufacturer: item.Manufacturer,
+						Dealer:       item.Dealer,
+						Number:       item.Number,
 					}
 					service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
 					if item.CountUnit == medical.MaxUnit {
 						maxNumber = cha_number / medical.MinNumber
 
-						parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+						parseDateErr := service.UpdateWarehouseInfoTwo(maxNumber, item.DrugId, item.OrgId)
 						fmt.Println("parseDateErr", parseDateErr)
 						if parseDateErr != nil {
 							utils.ErrorLog(errs.Error())
@@ -2016,7 +2007,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 							"max_unit":   "",
 						})
 						minNumber = cha_number % medical.MinNumber
-						parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+						parseDateErr = service.UpdateWarehouseInfoFour(minNumber, item.DrugId, item.OrgId)
 						if parseDateErr != nil {
 							utils.ErrorLog(errs.Error())
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
@@ -2034,7 +2025,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						})
 					}
 					if item.CountUnit == medical.MinUnit {
-						parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+						parseDateErr := service.UpdateWarehouseInfoFour(cha_number, item.DrugId, item.OrgId)
 						if parseDateErr != nil {
 							utils.ErrorLog(errs.Error())
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
@@ -2052,6 +2043,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						})
 					}
 				}
+				fmt.Println("cha_number233232323222332323232232", cha_number)
+				fmt.Println("all_number43444444444444444", all_number)
 				if all_number == cha_number {
 					warehouseInfo := models.XtDrugWarehouseInfo{
 						Number:       item.Number,
@@ -2066,21 +2059,83 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						MaxUnit:      item.CountUnit,
 					}
 					parseDateErr := service.UpdateDrugWarehouseingInfoSix(item.ID, warehouseInfo)
+
 					if parseDateErr != nil {
 						utils.ErrorLog(errs.Error())
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
 						return
 					}
+					fmt.Println("单位123223232323", item.CountUnit)
+					fmt.Println("单位232232323323232", medical.MaxUnit)
+
+					errs = service.UpDateDrugWarehouseOutInfo(item)
+					flow := models.DrugFlow{
+						Count:        item.Count,
+						ExpireDate:   item.ExpiryDate,
+						ProductDate:  item.ProductDate,
+						Price:        item.Price,
+						Manufacturer: item.Manufacturer,
+						Dealer:       item.Dealer,
+						Number:       item.Number,
+					}
+					service.UpdateDrugFlowSix(item.WarehouseOutId, item.DrugId, item.WarehouseOutOrderNumber, flow)
+					if item.CountUnit == medical.MaxUnit {
+						maxNumber = cha_number / medical.MinNumber
+
+						parseDateErr := service.UpdateWarehouseInfoTwo(maxNumber, item.DrugId, item.OrgId)
+						fmt.Println("parseDateErr", parseDateErr)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+						minNumber = cha_number % medical.MinNumber
+						parseDateErr = service.UpdateWarehouseInfoFour(minNumber, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
+					if item.CountUnit == medical.MinUnit {
+						parseDateErr := service.UpdateWarehouseInfoFour(cha_number, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":        "2",
-						"drug_name":  "",
-						"dose":       "",
-						"dose_unit":  "",
-						"min_number": "",
-						"min_unit":   "",
-						"max_unit":   "",
-					})
 				}
 				if all_number < cha_number {
 					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
@@ -2383,8 +2438,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			return
 		}
 
-		fmt.Println("时间任命323332233232", total_number, total_count)
-
 		//判断退库数量是否大于总入库数量
 		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2395,9 +2448,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		}
 
 		//判断总退库数量是否大于出库数量
-		fmt.Println("该批次总退库数量", can_number+total_number)
-		fmt.Println("总出库数量", out_number)
-		fmt.Println("当前退库数量", total_number)
+
 		if can_number+total_number > out_number {
 			//清空退库单
 			service.UpdateDrugCancel(item.CancelStockId)
@@ -2406,12 +2457,12 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			})
 			return
 		}
-		fmt.Println("当前退库数量", total_number)
-		fmt.Println("总出口数量", out_number)
+
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
 			errs := service.CreateCancelStockInfoTwo(item)
+			lastInfo, _ := service.GetLastStockInfoThree(item.DrugId)
 			//创建库存明细
 			flows := models.DrugFlow{
 				WarehousingId:           0,
@@ -2440,7 +2491,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				Price:                   item.Price,
 				WarehousingDetailId:     0,
 				WarehouseOutDetailId:    0,
-				CancelOutDetailId:       0,
+				CancelOutDetailId:       lastInfo.ID,
 				ExpireDate:              item.ExpiryDate,
 				ProductDate:             item.ProductDate,
 				MaxUnit:                 item.MaxUnit,
@@ -2570,6 +2621,8 @@ func (this *StockDrugApiController) DeleteDrugCancelStockInfo() {
 	}
 
 	err := service.UpDateDrugCancleStockStatus(id)
+
+	service.UpDateDrugCancelStockById(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2882,8 +2935,11 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				//创建库存明细
 				//查询这个药品这个订单是否已存在流水
 				for _, items := range drugFlow {
+					drugwarehouseinfo, _ := service.GetLastDrugCancelStockInfoById(items.DrugId)
+					items.CancelOutDetailId = drugwarehouseinfo.ID
 					_, errsId := service.GetCancelStockId(items.CancelStockId, items.DrugId)
 					if errsId == gorm.ErrRecordNotFound {
+
 						errs = service.CreateDrugFlowTwo(items)
 					}
 				}
@@ -2898,7 +2954,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				if lastCancel.MaxUnit == medical.MinUnit {
 					cancel_number = lastCancel.Count
 				}
-				fmt.Println("999999232323232232232323232323", item.Count, cancel_number)
+
 				var total int64
 
 				if medical.MaxUnit == item.MaxUnit {
@@ -2966,8 +3022,9 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 			//查询最后一条退库记录
 			info, _ := service.GetLastCancelStockInfoOne(id, item.DrugId)
+			fmt.Println("hh23232oooooooo2o3o2o32o23oo23o23o23", item.ExpiryDate, item.ProductDate)
 			errs = service.UpDateDrugCancelStockInfo(item)
-			fmt.Println("hh23232oooooooo2o3o2o32o23oo23o23o23", info)
+
 			//查询该药品的信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
 			//统计该批次的总出库数
@@ -3030,8 +3087,6 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 					Count: item.Count,
 				}
 				service.UpdatedDrugFlow(info.CancelStockId, item.DrugId, flow)
-				break
-
 			}
 
 			if item.MaxUnit == medical.MinUnit {
@@ -3042,12 +3097,11 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 					Count: item.Count,
 				}
 				service.UpdatedDrugFlow(info.CancelStockId, item.DrugId, flow)
-				break
 			}
 
 			//if(item.MaxUnit == info.MaxUnit && item.Count == info.Count){
-			//
-			//  service.UpdateDrugCancelStockInfo(item)
+			// fmt.Println("hhh23232323232进来23232323232")
+			// service.UpdateDrugCancelStockInfo(item)
 			//}
 		}
 	}

controllers/gobal_config_api_controller.go

@@ -2191,10 +2191,12 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 	ids := strings.Split(id, ",")
 	admin := c.GetAdminUserInfo()
 	info, _ := service.FindeDrugWarehouseOutOrder(ids, admin.CurrentOrgId)
-	//info, _ := service.GetExportOutOrderDrugListOne(ids)
+
 	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
-	//warehousing, _ := service.FindeDrugWarehouseOutDetail(ids, admin.CurrentOrgId)
+
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
+
+	//drug_warhouse_out, _ := service.GetDrugWarehouseOut(ids)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":             info,
 		"warehousing":      warehousing,

controllers/manage_api_controller.go

@@ -129,36 +129,34 @@ func ManageRouters() {
 func (this *MachineApiController) SaveManageInfo() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	//fmt.Println("机构id", orgid)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("err", err)
-	//serial_numbe := int64(dataBody["serial_number"].(float64))
+
 	serial_numbe := dataBody["serial_number"].(string)
-	//fmt.Println("序列号", serial_numbe)
+
 	device_type := int64(dataBody["device_type"].(float64))
-	//fmt.Println("设备类型", device_type)
+
 	bed_number := int64(dataBody["bed_number"].(float64))
-	//	fmt.Println("床位号", bed_number)
+
 	//通过床位id获取区号id
 	number, err := service.GetZoneId(bed_number, orgid)
-	//fmt.Println("number", number)
-	//	fmt.Println("获取分区id错误", err)
+
 	device_name := dataBody["device_name"].(string)
-	//	fmt.Println("设备名称", device_name)
+
 	manufacture_factory := dataBody["manufacture_factory"].(string)
-	//fmt.Println("生产厂家", manufacture_factory)
+
 	service_manufacturer := dataBody["service_manufacturer"].(string)
-	//	fmt.Println("维修厂家", service_manufacturer)
+
 	unittype := int64(dataBody["unit_type"].(float64))
 	unit_type := strconv.FormatInt(unittype, 10)
-	//	fmt.Println("设备型号", unit_type)
+
 	use_section := dataBody["use_section"].(string)
-	//fmt.Println("使用科室", use_section)
+
 	section_number := dataBody["section_number"].(string)
-	//	fmt.Println("科室编号", section_number)
+
 	buy_date := dataBody["buy_date"].(string)
-	//	fmt.Println("buy_date", buy_date)
+
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, buy_date+" 00:00:00")
 	buydate := theTime.Unix()
@@ -166,7 +164,6 @@ func (this *MachineApiController) SaveManageInfo() {
 	if int_num < 0 {
 		buydate = 0
 	}
-	//	fmt.Println("购买日期", buydate)
 
 	install_date := dataBody["install_date"].(string)
 	toTime, err := utils.ParseTimeStringToTime(timeLayout, install_date+" 00:00:00")
@@ -175,7 +172,6 @@ func (this *MachineApiController) SaveManageInfo() {
 	if buy_num < 0 {
 		installdate = 0
 	}
-	//fmt.Println("安装日期", installdate)
 
 	start_date := dataBody["start_date"].(string)
 	stringToTime, err := utils.ParseTimeStringToTime(timeLayout, start_date+" 00:00:00")
@@ -184,22 +180,13 @@ func (this *MachineApiController) SaveManageInfo() {
 	if start_num < 0 {
 		startdate = 0
 	}
-	//	fmt.Println("启用日期", startdate)
-
 	maintenance_engineer := dataBody["maintenance_engineer"].(string)
-	//fmt.Println("维修工程", maintenance_engineer)
 	telephone := dataBody["telephone"].(string)
-	//fmt.Println("telephone", telephone)
 	guarantee_date := dataBody["guarantee_date"].(string)
-	//	fmt.Println("保修期限", guarantee_date)
 	machine_status := int64(dataBody["machine_status"].(float64))
-	//fmt.Println("机器状态", machine_status)
 	user_total := dataBody["user_total"].(string)
-	//fmt.Println("初次使用次数", user_total)
 	disinfection_mode := int64(dataBody["Disinfection_mode"].(float64))
-	//fmt.Println("消毒方式", disinfection_mode)
 	remarks := dataBody["remarks"].(string)
-	//fmt.Println("备注", remarks)
 	rubbish_date := dataBody["rubbish_date"].(string)
 	timeStringToTime, err := utils.ParseTimeStringToTime(timeLayout, rubbish_date+" 00:00:00")
 	rubbishdate := timeStringToTime.Unix()
@@ -207,16 +194,11 @@ func (this *MachineApiController) SaveManageInfo() {
 	if rubb_num < 0 {
 		rubbishdate = 0
 	}
-	//fmt.Println("报废日期", rubbishdate)
 	rubbish_reason := int64(dataBody["rubbish_reason"].(float64))
-	//fmt.Println("报废原因", rubbish_reason)
 	user_year := dataBody["user_year"].(string)
-	//	fmt.Println("使用年限", user_year)
 	work_time := dataBody["work_time"].(string)
-	//fmt.Println("工作时长", work_time)
 	treat_types := dataBody["treat_type"].([]interface{})
 	revers := int64(dataBody["revers_mode"].(float64))
-	//fmt.Println("反渗模式", revers)
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -231,11 +213,11 @@ func (this *MachineApiController) SaveManageInfo() {
 	}
 
 	addmacher := &models.DeviceAddmacher{
-		SerialNumber: serial_numbe,
-		DeviceType:   device_type,
-		BedNumber:    number.Number,
-		BedId:        bed_number,
-		//ZoneId:              number.ZoneID,
+		SerialNumber:        serial_numbe,
+		DeviceType:          device_type,
+		BedNumber:           number.Number,
+		BedId:               bed_number,
+		ZoneId:              number.ZoneID,
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
@@ -262,7 +244,6 @@ func (this *MachineApiController) SaveManageInfo() {
 		UserOrgId:           orgid,
 	}
 	err = service.CreateMacher(addmacher)
-	//fmt.Println("什么原因啊", err)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -277,20 +258,9 @@ func (this *MachineApiController) SaveManageInfo() {
 		EquitmentId:   deviceAddmacher.ID,
 		BedId:         bed_number,
 	}
-
 	error := service.AddTreatMode(deviceAddmacher.ID, orgid, ids)
 	fmt.Println("error:", error)
-	name, errcode := service.GetEquitmentName(unit_type, orgid)
-	fmt.Print("错误", errcode)
-	fmt.Print("name", name)
 	err = service.CreateEquimentName(equimentname)
-	//if errcode == gorm.ErrRecordNotFound {
-	//	err = service.CreateEquimentName(equimentname)
-	//} else if errcode == nil {
-	//	fmt.Print("设备类型已经存在")
-	//} else {
-	//	fmt.Print("设备类型已经存在")
-	//}
 	fmt.Println("添加设备型号失败", err)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"addmacher": addmacher,
@@ -300,39 +270,20 @@ func (this *MachineApiController) SaveManageInfo() {
 func (this *MachineApiController) UpdateMachineInfo() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	//fmt.Println("机构id", orgid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("错误是", err)
 	id := int64(dataBody["id"].(float64))
-	fmt.Println("id是什么", id)
-	//serial_number := int64(dataBody["serial_number"].(float64))
 	serial_number := dataBody["serial_number"].(string)
-	fmt.Println("序列号", serial_number)
 	device_type := int64(dataBody["devicetype"].(float64))
-	fmt.Println("设备类型", device_type)
-
 	bed_number := int64(dataBody["bed_number"].(float64))
-	fmt.Println("机位号", bed_number)
-
 	number, err := service.GetZoneId(bed_number, orgid)
-	//fmt.Println("number是多少", number)
 	device_name := dataBody["device_name"].(string)
-	//fmt.Println("设备名称", device_name)
 	manufacture_factory := dataBody["manufacture_factory"].(string)
-	//fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
-	//fmt.Println("维修厂家", service_manufacturer)
 	unit_type := int64(dataBody["unit_type"].(float64))
-	//unit_type := strconv.FormatInt(unittype, 10)
-	fmt.Println("设备型号", unit_type)
-
 	use_section := dataBody["use_section"].(string)
-	//fmt.Println("使用科室", use_section)
 	section_number := dataBody["section_number"].(string)
-	//fmt.Println("科室编号", section_number)
 	buy_date := dataBody["buy_date"].(string)
-	//	fmt.Println("buy_date", buy_date)
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, buy_date+" 00:00:00")
 	buydate := theTime.Unix()
@@ -340,7 +291,6 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	if int_num < 0 {
 		buydate = 0
 	}
-	fmt.Println("购买日期", buydate)
 	install_date := dataBody["install_date"].(string)
 	toTime, err := utils.ParseTimeStringToTime(timeLayout, install_date+" 00:00:00")
 	installdate := toTime.Unix()
@@ -348,8 +298,6 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	if buy_num < 0 {
 		installdate = 0
 	}
-	//fmt.Println("安装日期", installdate)
-
 	start_date := dataBody["start_date"].(string)
 	stringToTime, err := utils.ParseTimeStringToTime(timeLayout, start_date+" 00:00:00")
 	startdate := stringToTime.Unix()
@@ -357,19 +305,12 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	if start_num < 0 {
 		startdate = 0
 	}
-	//fmt.Println("启用日期", startdate)
 	maintenance_engineer := dataBody["maintenance_engineer"].(string)
-	//fmt.Println("维修工程", maintenance_engineer)
 	telephone := dataBody["telephone"].(string)
-	//fmt.Println("telephone", telephone)
 	guarantee_date := dataBody["guarantee_date"].(string)
-	//fmt.Println("保修期限", guarantee_date)
 	machine_status := int64(dataBody["machine_status"].(float64))
-	//fmt.Println("机器状态", machine_status)
 	user_total := dataBody["user_total"].(string)
-	//fmt.Println("初次使用次数", user_total)
 	remarks := dataBody["remarks"].(string)
-	//fmt.Println("备注", remarks)
 	rubbish_date := dataBody["rubbish_date"].(string)
 	timeStringToTime, err := utils.ParseTimeStringToTime(timeLayout, rubbish_date+" 00:00:00")
 	rubbishdate := timeStringToTime.Unix()
@@ -377,21 +318,15 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	if rubb_num < 0 {
 		rubbishdate = 0
 	}
-	//fmt.Println("报废日期", rubbishdate)
 	rubbish_reason := int64(dataBody["rubbish_reason"].(float64))
-	//fmt.Println("报废原因", rubbish_reason)
 	user_year := dataBody["user_year"].(string)
-	//fmt.Println("使用年限", user_year)
 	work_time := dataBody["work_time"].(string)
-	//fmt.Println("工作时长", work_time)
 	treat_types := dataBody["treat_type"].([]interface{})
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
 		ids = append(ids, id)
 	}
-	fmt.Println("ids", ids)
-	//service.GetModeName(unit_type)
 	thisAddmacher, err := service.GetEquitmentByBedID(bed_number, orgid)
 	if thisAddmacher.ID > 0 && thisAddmacher.ID != id {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisNoExist)
@@ -423,11 +358,7 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		UserYear:            user_year,
 		WorkTime:            work_time,
 	}
-	//fmt.Println("addmacher", addmacher)
 	err = service.UpdateMachine(id, orgid, &addmacher)
-	//mt.Println("报错", err)
-	//zone, err := service.GetZoneName(number.ZoneID, orgid)
-	//fmt.Println("zoneerr",err)
 	errors := service.UpdateTreatMode(id, orgid, ids)
 	fmt.Println("更新透析模式失败", errors)
 	if err != nil {
@@ -697,12 +628,15 @@ func (this *MachineApiController) GetAllEquimentName() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	equit, err := service.GetAllEquimentName(orgid)
+	list, _ := service.GetAllDeviceMode(orgid)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"equit": equit,
+		"list":  list,
 	})
 }
 
@@ -919,29 +853,30 @@ func (this *MachineApiController) UpdatePlanInfo() {
 
 func (this *MachineApiController) GetComprehensive() {
 	zone, _ := this.GetInt64("zone")
-	//fmt.Println("分区", zone)
+
 	number, _ := this.GetInt64("number")
-	//fmt.Println("机号", number)
+
 	devicetype, _ := this.GetInt64("devicetype")
-	//fmt.Println("type", devicetype)
+
 	year, _ := this.GetInt64("year")
-	//fmt.Println("year", year)
 
 	startTime := this.GetString("starttime")
-	//fmt.Println("开始时间", startTime)
+
+	device_mode, _ := this.GetInt64("device_mode")
+
+	fmt.Println("hh232323233232232233223232323", device_mode)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", startTime+" 00:00:00", loc)
 	starts := theTime.Unix()
-	//fmt.Println("开始日期", starts)
 
 	endtime := this.GetString("endtime")
 	location, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
 	end := location.Unix()
-	//fmt.Println("endtime", end)
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	macher, err := service.GetComprehensive(zone, number, devicetype, year, starts, end, orgid)
+	macher, err := service.GetComprehensive(zone, number, devicetype, year, starts, end, orgid, device_mode)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败:（"+err.Error()+"）")
 		return
@@ -954,21 +889,17 @@ func (this *MachineApiController) GetComprehensive() {
 func (this *MachineApiController) GetPatientInfo() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	//fmt.Println("机构id", orgid)
 	id, _ := this.GetInt64("id")
-	//fmt.Println("设备id", id)
 	addmacher, _ := service.GetBedId(id)
-	//fmt.Println("addmacher", addmacher.BedId)
+
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
-	//fmt.Println("timeStr:", timeStr)
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 	timenow := timeStringToTime.Unix()
-	//fmt.Println("timenow是什么", timenow)
-	//fmt.Println("时间搓", timeStringToTime.Unix())
+
 	//获取当天床位号排班的所有病人
 	schedules, err := service.GetPatientInfo(addmacher.BedId, timenow, orgid)
-	//fmt.Println("错误", err)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败:（"+err.Error()+"）")
 		return

controllers/schedule_api_controller.go

@@ -2031,16 +2031,20 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
 	record_date := this.GetString("record_date")
 
 	zons := this.GetString("zone")
 	zone := strings.Split(zons, ",")
-	adminUserInfo := this.GetAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 
+	adminUserInfo := this.GetAdminUserInfo()
 	var theStartTIme int64
 	if len(record_date) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
@@ -2050,7 +2054,7 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 		theStartTIme = theTime.Unix()
 	}
 
-	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, theTimeStart.Unix(), theTimeEnd.Unix(), adminUserInfo.CurrentOrgId, zone, theStartTIme)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/stock_in_api_controller.go

@@ -305,7 +305,10 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 	//入库单创建成功
 	errs := service.CreateWarehousingInfo(warehousingInfo)
-
+	for _, its := range stockFlow {
+		warehousinginfo, _ := service.GetLastWarehousingInfo(its.GoodId)
+		its.WarehousingDetailId = warehousinginfo.ID
+	}
 	//创建入库单流水
 	service.CreateStockFlow(stockFlow)
 
@@ -691,10 +694,18 @@ func (c *StockManagerApiController) EditWarehouse() {
 				}
 
 				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+
 				flowStock := models.VmStockFlow{
-					Count: item.WarehousingCount,
-				}
-				service.UpdatedStockFlowByGoodId(item.WarehousingId, item.GoodId, flowStock)
+					Count:         item.WarehousingCount,
+					Number:        item.Number,
+					ProductDate:   item.ProductDate,
+					ExpireDate:    item.ExpiryDate,
+					Price:         item.Price,
+					Manufacturer:  item.Manufacturer,
+					Dealer:        item.Dealer,
+					LicenseNumber: info.LicenseNumber,
+				}
+				service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)
@@ -775,6 +786,8 @@ func (c *StockManagerApiController) DeleteWarehouse() {
 
 	idArray := strings.Split(ids, ",")
 	err := service.DeleteWarehouse(idArray)
+	//删除流水
+	service.DeleteStockFlow(idArray)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -792,6 +805,7 @@ func (c *StockManagerApiController) DeleteWarehouseInfo() {
 	}
 
 	err := service.UpDateWarehouseStatus(id)
+	service.UpdatedStockFlowById(id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1312,7 +1326,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 		// 查询该耗材是否有库存
 		warehouseOne, _ := service.FindWarehousingInfoTen(item.GoodId)
-		fmt.Println("hhh2333223223", item.GoodId, item.Count, warehouseOne.StockCount)
+
 		// 如果出库数量大于该批次剩余库存数量
 		if item.Count > warehouseOne.StockCount {
 
@@ -1436,6 +1450,7 @@ func (this *StockManagerApiController) DeleteWarehouseOutInfo() {
 	}
 
 	err := service.UpDateWarehouseOutStatus(id)
+	service.UpdateStockFlowWarehouseOutById(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -1697,13 +1712,11 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-			fmt.Println("item2332323232323", item.ProductDate, item.ExpiryDate)
 
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
 
-			// 退库的库存和该耗材该批次最后一次出库数量进行比较
-			//如果退库数量大于 最后一次批次的数量(要么要进行出库)
+			//如果出库数量大于 最后一次批次的数量(那么要进行出库)
 
 			if item.Count > lastGood.Count {
 
@@ -1726,13 +1739,19 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					//计算和最后一次出库数据的差
 					total = item.Count - lastGood.Count
 
+					if total > warehouseinfo.StockCount {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "6",
+						})
+						return
+					}
 					//获取该耗材该批次的剩余库存量
 					info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
 
 					//判断该批次的剩余库存 和出库的库存进行比较
 					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
 
-					if item.Count > info.StockCount {
+					if total > info.StockCount {
 						//计算出库和该批次相差的库存
 						total_count = item.Count - info.StockCount
 						//清空本批次次库存
@@ -1748,8 +1767,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							"msg": "1",
 						})
 					}
-					//如果出库的库存小于或等于于该批次的剩余库存,那么需要该批次出库
-					if item.Count <= info.StockCount {
+					//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
+					if total <= info.StockCount {
 						stock_cout = lastGood.Count + total
 						fmt.Println(stock_cout)
 						//扣减库存
@@ -1785,6 +1804,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						//查询是否存在
 						_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
 						if errcode == gorm.ErrRecordNotFound {
+
 							errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 							if errOne != nil {
 								utils.ErrorLog(errs.Error())
@@ -1797,12 +1817,29 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							return
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
+							//更新流水
+							flow := models.VmStockFlow{
+								Number:        item.Number,
+								LicenseNumber: item.LicenseNumber,
+								Count:         item.Count,
+								Manufacturer:  item.Manufacturer,
+								Dealer:        item.Dealer,
+								ProductDate:   item.ProductDate,
+								ExpireDate:    item.ExpiryDate,
+								Price:         item.Price,
+							}
+							service.UpdateStockFlowByDetailId(flow, item.ID)
+
+							goodInfo := models.GoodInfo{
+								Manufacturer: item.Manufacturer,
+								Dealer:       item.Dealer,
+							}
+							service.UpdatedGoodInfo(goodInfo, item.GoodId)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg": "1",
 							})
 							return
 						}
-
 					}
 				}
 			}
@@ -1874,6 +1911,22 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						return
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
+						flow := models.VmStockFlow{
+							Number:        item.Number,
+							LicenseNumber: item.LicenseNumber,
+							Count:         item.Count,
+							Manufacturer:  item.Manufacturer,
+							Dealer:        item.Dealer,
+							ProductDate:   item.ProductDate,
+							ExpireDate:    item.ExpiryDate,
+							Price:         item.Price,
+						}
+						service.UpdateStockFlowByDetailId(flow, item.ID)
+						goodInfo := models.GoodInfo{
+							Manufacturer: item.Manufacturer,
+							Dealer:       item.Dealer,
+						}
+						service.UpdatedGoodInfo(goodInfo, item.GoodId)
 						return
 					}
 				}
@@ -1890,6 +1943,22 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 			if item.Count == lastGood.Count {
 
 				errs = service.UpDateWarehouseOutInfo(item)
+				flow := models.VmStockFlow{
+					Number:        item.Number,
+					LicenseNumber: item.LicenseNumber,
+					Count:         item.Count,
+					Manufacturer:  item.Manufacturer,
+					Dealer:        item.Dealer,
+					ProductDate:   item.ProductDate,
+					ExpireDate:    item.ExpiryDate,
+					Price:         item.Price,
+				}
+				service.UpdateStockFlowByDetailId(flow, item.ID)
+				goodInfo := models.GoodInfo{
+					Manufacturer: item.Manufacturer,
+					Dealer:       item.Dealer,
+				}
+				service.UpdatedGoodInfo(goodInfo, item.GoodId)
 				if errs != nil {
 					utils.ErrorLog(errs.Error())
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
@@ -2056,6 +2125,16 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
+				list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+
+				var manufacturer_id int64
+
+				for _, items := range list {
+					if manufacturer == items.ManufacturerName {
+						manufacturer_id = items.ID
+					}
+				}
+
 				flow := &models.VmStockFlow{
 					WarehousingId:           0,
 					GoodId:                  good_id,
@@ -2073,7 +2152,7 @@ func (c *StockManagerApiController) CreateCancelStock() {
 					IsEdit:                  0,
 					CancelStockId:           cancelStock.ID,
 					CancelOrderNumber:       cancelStock.OrderNumber,
-					Manufacturer:            0,
+					Manufacturer:            manufacturer_id,
 					Dealer:                  0,
 					Creator:                 adminUserInfo.AdminUser.Id,
 					UpdateCreator:           0,
@@ -2094,11 +2173,8 @@ func (c *StockManagerApiController) CreateCancelStock() {
 
 	for _, item := range cancelStockInfos {
 
-		//统计该批次耗材的出库数量
-		//info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
-
 		info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
-		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
+
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -2124,11 +2200,17 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			}
 			listcancel, _ := service.GetLastCancelStockById(adminUserInfo.CurrentOrgId)
 
-			fmt.Println("2332323232323232323", cancelStockInfos)
 			item.CancelStockId = listcancel.ID
 			errs := service.CreateCancelStockInfoOne(item)
 
 			if len(stockFLow) > 0 {
+
+				for _, items := range stockFLow {
+					cancelStockInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+					items.CancelStockId = listcancel.ID
+					items.CancelOutDetailId = cancelStockInfo.ID
+
+				}
 				service.CreateStockFlow(stockFLow)
 			}
 			if errs != nil {
@@ -2245,6 +2327,7 @@ func (this *StockManagerApiController) DeleteCancelStockInfo() {
 	}
 
 	err := service.UpDateCancleStockStatus(id)
+	service.UpdatedStockFlowByCancelId(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteFail)
 	} else {
@@ -2376,6 +2459,8 @@ func (c *StockManagerApiController) EditCancelStock() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 				if id == 0 {
 					cancelStockInfo := &models.CancelStockInfo{
 						GoodId:          good_id,
@@ -2395,6 +2480,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 						ExpiryDate:      expiryDates,
 						Remark:          remark,
 						Price:           price,
+						WarehouseInfoId: warehouse_info_id,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -2423,7 +2509,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 						Ctime:                   time.Now().Unix(),
 						Mtime:                   0,
 						Price:                   price,
-						WarehousingDetailId:     0,
+						WarehousingDetailId:     warehouse_info_id,
 						WarehouseOutDetailId:    0,
 						CancelOutDetailId:       0,
 						ProductDate:             productDates,
@@ -2452,9 +2538,19 @@ func (c *StockManagerApiController) EditCancelStock() {
 						ExpiryDate:      expiryDates,
 						Remark:          remark,
 						Price:           price,
+						WarehouseInfoId: warehouse_info_id,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 
+					list, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+
+					var manufacuture_id int64
+					for _, it := range list {
+						if it.ManufacturerName == manufacturer {
+							manufacuture_id = it.ID
+						}
+					}
+
 					flow := &models.VmStockFlow{
 						WarehousingId:           0,
 						GoodId:                  good_id,
@@ -2472,7 +2568,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 						IsEdit:                  2,
 						CancelStockId:           cancelStock.ID,
 						CancelOrderNumber:       cancelStock.OrderNumber,
-						Manufacturer:            0,
+						Manufacturer:            manufacuture_id,
 						Dealer:                  0,
 						Creator:                 adminUserInfo.AdminUser.Id,
 						UpdateCreator:           0,
@@ -2480,7 +2576,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 						Ctime:                   time.Now().Unix(),
 						Mtime:                   0,
 						Price:                   price,
-						WarehousingDetailId:     0,
+						WarehousingDetailId:     warehouse_info_id,
 						WarehouseOutDetailId:    0,
 						CancelOutDetailId:       0,
 						ProductDate:             productDates,
@@ -2535,36 +2631,50 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		if len(stockFlow) > 0 {
 			for _, itemcancel := range stockFlow {
-
+				fmt.Println("hhh233232323323233223323232我的时间")
 				//查询是否存在
 				stockInfo, errcode := service.IsExsitStockFlow(itemcancel.GoodId, itemcancel.CancelOrderNumber)
 				if errcode == gorm.ErrRecordNotFound {
-
+					service.CreateStockFlowSix(itemcancel)
 				} else {
 					flow := models.VmStockFlow{
-						Count: itemcancel.Count,
+						Count:        itemcancel.Count,
+						Manufacturer: itemcancel.Manufacturer,
+						Dealer:       itemcancel.Dealer,
+						Price:        itemcancel.Price,
+						ProductDate:  itemcancel.ProductDate,
+						ExpireDate:   itemcancel.ExpireDate,
 					}
-					service.UpdateStockFlowTwo(stockInfo.ID, flow)
+					service.UpdateStockFlowThree(stockInfo.ID, flow)
 				}
 			}
-			//service.CreateStockFlow(stockFlow)
 		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
 		for _, item := range upDateCancelStockInfos {
 
-			//获取该批次最后一套出库记录
+			var all_total int64
+			//获取该批次最后一套退库记录
 			info, _ := service.GetLastCancelInfo(item.WarehouseInfoId, item.GoodId)
+			//查询该批次总的退库数量
+			list, _ := service.GetAllCancelInfoById(item.WarehouseInfoId, item.GoodId)
+			for _, it := range list {
+				all_total += it.Count
+			}
+			fmt.Println("最后一次出库233223323233223", info.Count)
+			fmt.Println("当前出库23323223232323323", item.Count)
 
-			//比较出库数量和最后一次出库数据大小
+			//比较退库库数量和最后一次退库库数据大小
 			//退库(加)
-			if item.Count < info.Count {
-				var total = info.Count - item.Count
+			if item.Count > info.Count {
+				var total = item.Count - info.Count
 				errs = service.UpDateCancelStockInfo(item)
 
 				warehouseinfo, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
-				if (warehouseinfo.StockCount + total) > warehouseinfo.StockCount {
+
+				// 总退库数量大于入库数据
+				if all_total > warehouseinfo.StockCount {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "5",
 					})
@@ -2578,26 +2688,18 @@ func (c *StockManagerApiController) EditCancelStock() {
 				}
 			}
 			//(减)
-			if item.Count > info.Count {
+			if item.Count < info.Count {
 				errs = service.UpDateCancelStockInfo(item)
-				//查询该批次入库的值
-				infolist, _ := service.GetWarehouseInfoById(item.WarehouseInfoId)
-				if item.Count > infolist.WarehousingCount {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "4",
-					})
+
+				var total_count = info.Count - item.Count
+
+				parseDateErr := service.UpdateWareInfoByIdSix(item.WarehouseInfoId, total_count)
+				if parseDateErr != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 					return
 				}
-				if item.Count <= infolist.WarehousingCount {
-					var total_count = info.Count - item.Count
 
-					parseDateErr := service.UpdateWareInfoById(item.WarehouseInfoId, total_count)
-					if parseDateErr != nil {
-						utils.ErrorLog(errs.Error())
-						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-						return
-					}
-				}
 			}
 			if item.Count == info.Count {
 				errs = service.UpDateCancelStockInfo(item)
@@ -2613,9 +2715,14 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 			} else {
 				flow := models.VmStockFlow{
-					Count: itemcancel.Count,
-				}
-				service.UpdateStockFlowTwo(stockInfo.ID, flow)
+					Count:         itemcancel.Count,
+					Manufacturer:  itemcancel.Manufacturer,
+					Dealer:        itemcancel.Dealer,
+					Price:         itemcancel.Price,
+					LicenseNumber: itemcancel.LicenseNumber,
+					Number:        itemcancel.Number,
+				}
+				service.UpdateStockFlowThree(stockInfo.ID, flow)
 			}
 		}
 	}

models/dialysis_parameter_models.go

@@ -132,6 +132,8 @@ type DialysisPrescriptionParameter struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (DialysisPrescriptionParameter) TableName() string {

service/data.go

@@ -318,7 +318,7 @@ func BatchInspectionConfiguration(orgid int64) (err error) {
 }
 
 func ShowFiledConfig(org_id int64, isShow int, id int64) (err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"ctime": time.Now().Unix(), "mtime": time.Now().Unix(), "is_show": isShow}).Error
+	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow}).Error
 	return
 }
 

service/device_service.go

@@ -504,6 +504,30 @@ func UpdateDeviceNumber(number *models.DeviceNumber) error {
 	return nil
 }
 
+func GetAddMacherByBedId(bedid int64, user_org_id int64) (*models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Where("bed_id = ? and status = 1 and user_org_id = ?", bedid, user_org_id).Find(&addmacher).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &addmacher, nil
+}
+
+func UpdateAddmacherByBedId(bedId int64, addmacher models.DeviceAddmacher) error {
+	tx := UserWriteDB().Begin()
+	err := tx.Model(&addmacher).Where("bed_id = ? and status = 1", bedId).Updates(map[string]interface{}{"zone_id": addmacher.ZoneId}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
+}
+
 func GetDeviceNumberCountForZoneID(orgID int64, zoneID int64) (int, error) {
 	var count int
 	err := readDb.Model(&models.DeviceNumber{}).Where("zone_id = ? AND org_id = ? AND status = 1", zoneID, orgID).Count(&count).Error
@@ -547,32 +571,6 @@ func GetZoneId(bednumber int64, orgid int64) (models.DeviceNumber, error) {
 	return number, err
 }
 
-//func AddMacher(deviceaddmacher *models.DeviceAddmacher) error{
-//	fmt.Println("进来了没哟")
-//	tx := writeDb.Begin()
-//	err := tx.Model(&models.DeviceAddmachers{}).Create(&deviceaddmacher).Error
-//	fmt.Println("错误是什么",err)
-//	if err !=nil{
-//		tx.Rollback()
-//	}
-//	tx.Commit()
-//	return err
-//}
-
-// func CreateMacher(machers *models.DeviceAddmacher) error {
-//      fmt.Println("进来了米有")
-// 	begin := writeDb.Begin()
-// 	fmt.Println("hhhhhhhh",begin)
-// 	err := begin.Model(&models.DeviceAddmacher{}).Create(machers).Error
-// 	fmt.Println("err",err)
-// 	if err !=nil{
-// 		begin.Rollback()
-// 	}
-// 	begin.Commit()
-// 	fmt.Println("执行了没有")
-// 	return err
-// }
-
 func GetLastMacherData(orgid int64) (models.DeviceAddmacher, error) {
 	addmacher := models.DeviceAddmacher{}
 	err := UserReadDB().Model(&addmacher).Where("user_org_id = ? AND status = ?", orgid, 1).Last(&addmacher).Error
@@ -621,7 +619,6 @@ func AddTreatMode(machineid int64, orgid int64, treatmodes []int64) (err error)
 
 func GetAllMachineInfo(page int64, limit int64, keyword string, zoneid int64, equimentid int64, statusid int64, orgid int64) (addmahcer []*models.DeviceAddmachers, total int64, err error) {
 
-	//db := readUserDb().Table("xt_device_addmacher as a").Where("a.status = 1")
 	db := readUserDb.Table("xt_device_addmacher as a").Where("a.status = 1")
 	table := XTReadDB().Table("xt_device_zone as x")
 	d := readUserDb.Table("xt_device_mode as m")

service/manage_service.go

@@ -103,6 +103,12 @@ func GetAllEquimentName(orgid int64) (equit []*models.DeviceEquimentname, err er
 	return equit, err
 }
 
+func GetAllDeviceMode(orgid int64) (device []*models.DeviceMode, err error) {
+
+	err = readUserDb.Model(&device).Where("user_org_id = ? and status = 1", orgid).Find(&device).Error
+	return device, err
+}
+
 func GetBed(equitid int64) (models.DeviceAddmacher, error) {
 	addmacher := models.DeviceAddmacher{}
 	err := UserReadDB().Where("id=? AND status = ?", equitid, 1).Find(&addmacher).Error
@@ -257,7 +263,7 @@ func UpdatePlanInfo(id int64, orgid int64, plan models.DevicePlan) error {
 	return err
 }
 
-func GetComprehensive(zone int64, number int64, devicetype int64, year int64, starttime int64, endtime int64, orgid int64) (macher []*models.DeviceAddmachers, err error) {
+func GetComprehensive(zone int64, number int64, devicetype int64, year int64, starttime int64, endtime int64, orgid int64, device_mode int64) (macher []*models.DeviceAddmachers, err error) {
 	db := readUserDb.Table("xt_device_addmacher as a").Where("a.status = 1")
 	table := XTReadDB().Table("xt_device_zone as x")
 	fmt.Println(table)
@@ -273,6 +279,9 @@ func GetComprehensive(zone int64, number int64, devicetype int64, year int64, st
 	if devicetype > 0 {
 		db = db.Where("a.device_type = ?", devicetype)
 	}
+	if device_mode > 0 {
+		db = db.Where("a.unit_type = ?", device_mode)
+	}
 	if year == 1 {
 		db = db.Where("a.user_year >= 0 AND a.user_year <= 1")
 	}

service/mobile_dialysis_service.go

@@ -791,6 +791,20 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	}
 }
 
+// 透析记录
+func MobileGetSchedualDialysisRecordTen(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
+	var record models.DialysisOrder
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 // 透析记录
 func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder

service/patient_service.go

@@ -283,7 +283,6 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 		if assessment_befores_list_all == "null" {
-			fmt.Println("尽力2323232", assessment_befores_list_all)
 			return nil, nil
 		} else {
 			json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)

service/schedule_service.go

@@ -838,10 +838,11 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
-		Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date = ?", record_date).
-		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Order("id asc")
-		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		Preload("XtAssessmentBeforeDislysis", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 and assessment_date = ?", record_date)
+		}).Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Order("id asc")
+	}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", record_date).Preload("ChildDoctorAdvice", "status = 1 and advice_date = ?", record_date)

service/self_drug_service.go

@@ -1043,12 +1043,6 @@ func GetLastDrugWarehouseInfSix(drugid int64) (models.XtDrugWarehouseInfo, error
 	err := XTReadDB().Model(&info).Where("drug_id=? and status = 1", drugid).Last(&info).Error
 	return info, err
 }
-//func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
-//
-//	info := models.XtDrugWarehouseInfo{}
-//	err := XTReadDB().Model(&info).Where("id=? and status = 1", drugid).Last(&info).Error
-//	return info, err
-//}
 
 func GetFirstDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
 

service/stock_service.go

@@ -267,6 +267,30 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
 		db = db.Where("good_code LIKE ? OR good_name LIKE ?", likeKey, likeKey)
+		if is_use > 0 {
+			if is_use == 1 {
+				db = db.Where("find_in_set('停用',good_status) = 0")
+			} else {
+				db = db.Where("find_in_set('停用',good_status) > 0")
+			}
+		}
+		if is_charge > 0 {
+			if is_charge == 1 {
+				db = db.Where("find_in_set('收费',good_status) > 0")
+			} else {
+				db = db.Where("find_in_set('收费',good_status) = 0")
+			}
+		}
+		if good_kind > 0 {
+			db = db.Where(" good_kind = ?", good_kind)
+		}
+
+		if is_mark > 0 {
+			db = db.Where("is_mark = ?", is_mark)
+		}
+		if manufacturer > 0 {
+			db = db.Where("manufacturer = ?", manufacturer)
+		}
 	} else {
 		if is_use > 0 {
 			if is_use == 1 {
@@ -626,6 +650,12 @@ func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err err
 
 }
 
+func GetLastWarehousingInfo(goodid int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodid).Last(&info).Error
+	return info, err
+}
+
 func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
 	return info, err
@@ -1549,6 +1579,19 @@ func GetCancelStockDetailByOrderNumber(ordernumber string, orgid int64) (*models
 	return &stock, nil
 }
 
+func GetCancelStockDetailByOrderNumberOne(return_time int64, orgid int64) (*models.CancelStock, error) {
+
+	stock := models.CancelStock{}
+	err := XTReadDB().Where("return_time = ? and org_id = ? and status = 1", return_time, orgid).Find(&stock).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &stock, nil
+}
+
 func AddSigleCancelStock(cancelStock *models.CancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -1633,12 +1676,32 @@ func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
 	return err
 }
 
+func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
+
+	info := models.DrugCancelStockInfo{}
+
+	err := XTReadDB().Model(&info).Where("drug_id = ? and status = 1", drugid).Find(&info).Error
+	return info, err
+}
+
 func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
 
 	err := XTWriteDB().Create(&info).Error
 	return err
 }
 
+func GetLastCancelStockInfoByGoodId(goodId int64) (models.CancelStockInfo, error) {
+	info := models.CancelStockInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and status = 1", goodId).Last(&info).Error
+	return info, err
+}
+
+func GetLastDrugCancelStockInfoById(drugid int64) (models.DrugCancelStockInfo, error) {
+	info := models.DrugCancelStockInfo{}
+	err := XTReadDB().Model(&info).Where("drug_id = ? and status = 1", drugid).Last(&info).Error
+	return info, err
+}
+
 func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1819,6 +1882,12 @@ func UpDateWarehouseInfo(warehouseInfo *models.WarehousingInfo) (err error) {
 
 func UpDateWarehouseStatus(id int64) (err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
+	return
+}
+
+func UpdatedStockFlowById(id int64) (err error) {
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehousing_detail_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return
 }
 
@@ -1827,6 +1896,11 @@ func UpDateDrugWarehouseStatus(id int64) (err error) {
 	return
 }
 
+func UpdateDrugFlowById(id int64) (err error) {
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func DeleteWarehouse(ids []string) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.Warehousing{}).Where("id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
@@ -1839,6 +1913,18 @@ func DeleteWarehouse(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+
+	ut.Commit()
+	return
+}
+
+func DeleteStockFlow(ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.VmStockFlow{}).Where("warehousing_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -1855,6 +1941,12 @@ func DeleteDrugWarehouse(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+
+	err = ut.Model(&models.DrugFlow{}).Where("warehousing_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -2118,6 +2210,12 @@ func DeleteWarehouseOut(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+
+	err = ut.Model(&models.VmStockFlow{}).Where("warehouse_out_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -2134,6 +2232,12 @@ func DeleteDrugWarehouseOut(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+
+	err = ut.Model(&models.DrugFlow{}).Where("warehouse_out_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -2143,6 +2247,11 @@ func UpDateWarehouseOutStatus(id int64) (err error) {
 	return
 }
 
+func UpdateStockFlowWarehouseOutById(id int64) (err error) {
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_detail_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Save(&info).Error
@@ -2175,6 +2284,11 @@ func UpDateDrugWarehouseOutStatus(id int64) (err error) {
 	return
 }
 
+func DeleteDrugWarehouseOutInfoById(id int64) (err error) {
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("warehouse_out_detail_id = ? and satus = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
 func EditWarehouseOut(warehouseOut models.WarehouseOut) {
 	err = readDb.Model(&models.WarehouseOut{}).Where("id = ? AND status = 1", warehouseOut.ID).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehouse_out_time": warehouseOut.WarehouseOutTime, "dealer": warehouseOut.Dealer, "manufacturer": warehouseOut.Manufacturer}).Error
 }
@@ -2195,7 +2309,7 @@ func UpDateDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) (err error) {
 
 func UpdateDrugFlowSix(warehousoutid int64, drugid int64, warehouse_out_order_number string, flow models.DrugFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and drug_id = ? and warehouse_out_order_number = ?", warehousoutid, drugid, warehouse_out_order_number).Updates(map[string]interface{}{"count": flow.Count}).Error
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and drug_id = ? and warehouse_out_order_number = ?", warehousoutid, drugid, warehouse_out_order_number).Updates(map[string]interface{}{"count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number}).Error
 	return err
 }
 
@@ -2255,6 +2369,11 @@ func DeleteCancelStock(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+	err = ut.Model(&models.VmStockFlow{}).Where("cancel_stock_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -2271,6 +2390,11 @@ func DeleteDrugCancelStock(ids []string) (err error) {
 		ut.Rollback()
 		return
 	}
+	err = ut.Model(&models.DrugFlow{}).Where("cancel_stock_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
 	ut.Commit()
 	return
 }
@@ -2280,11 +2404,23 @@ func UpDateCancleStockStatus(id int64) (err error) {
 	return
 }
 
+func UpdatedStockFlowByCancelId(id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_out_detail_id = ? and status = 0", id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
 func UpDateDrugCancleStockStatus(id int64) (err error) {
 	err = readDb.Model(&models.DrugCancelStockInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
 
+func UpDateDrugCancelStockById(id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("cancel_out_detail_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
 func EditCancelStock(sales models.CancelStock) {
 	err = readDb.Model(&models.CancelStock{}).Where("id = ? AND status = 1", sales.ID).Update(map[string]interface{}{"mtime": time.Now().Unix(), "return_time": sales.ReturnTime, "dealer": sales.Dealer, "manufacturer": sales.Manufacturer}).Error
 
@@ -3300,6 +3436,18 @@ func DeleteAutoRedeceDetailTwo(orgid int64, patient_id int64, recordtime int64,
 	return err
 }
 
+func DeleteAutoRedeceDetailTen(orgid int64, patient_id int64, recordtime int64, goodid int64) error {
+
+	detail := models.BloodAutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? ", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	info := models.WarehouseOutInfo{}
+	err = XTWriteDB().Model(&info).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	prepare := models.DialysisBeforePrepare{}
+	err = XTWriteDB().Model(&prepare).Where("user_org_id = ? and patient_id = ? and record_date = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	return err
+
+}
+
 func UpDateWarehouseInfoByStockDelete(id int64, count int64) (err error) {
 	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
 	return err
@@ -4050,6 +4198,12 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	return out, err
 }
 
+func GetDrugWarehouseOut(warehouse_out_id []string) (out []*models.StDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?)", warehouse_out_id).Find(&out).Error
+	return out, err
+}
+
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -4085,7 +4239,7 @@ func UpdateWarehousingInfo(info models.WarehousingInfo, id int64) error {
 }
 
 func FindFirstWarehousingInfoByGoodId(good_id int64, id int64) (info models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and stock_count > 0", good_id).Order("ctime asc").First(&info).Error
+	err = readDb.Where("good_id = ? AND status = 1 and stock_count > 0", good_id).Order("ctime asc").First(&info).Error
 	return info, err
 }
 
@@ -4147,6 +4301,12 @@ func CreateStockFlowOne(flow models.VmStockFlow) error {
 	return err
 }
 
+func CreateStockFlowSix(flow *models.VmStockFlow) error {
+
+	err := XTWriteDB().Create(&flow).Error
+	return err
+}
+
 func UpdatedStockFlow(flow models.VmStockFlow) error {
 	err := XTWriteDB().Save(&flow).Error
 	return err
@@ -4203,7 +4363,7 @@ func GetWarehouseOutInfoIsExistOne(good_id int64, patient_id int64, record_time
 func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int64, startTime int64, endTime int64, good_id int64) (flow []*models.VmStockFlow, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := XTReadDB().Model(&flow)
+	db := XTReadDB().Model(&flow).Where("status = 1 and count > 0")
 	if consumable_type > 0 {
 		//入库
 		if consumable_type == 1 {
@@ -4485,12 +4645,25 @@ func UpdateWarehouseInfo(count int64, drugid int64, orgid int64) error {
 	return err
 }
 
+func UpdateWarehouseInfoTwo(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+
+	return err
+}
+
 func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64) error {
 
 	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
 }
 
+func UpdateWarehouseInfoFour(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	return err
+}
+
 func GetWarehouseInfoByIdSeven(id int64) (models.WarehousingInfo, error) {
 
 	info := models.WarehousingInfo{}
@@ -4541,12 +4714,24 @@ func UpdateWareInfoById(id int64, count int64) error {
 	return err
 }
 
+func UpdateWareInfoByIdSix(id int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
+	return err
+}
+
 func GetLastCancelInfo(id int64, goodid int64) (models.CancelStockInfo, error) {
 	info := models.CancelStockInfo{}
 	err := XTReadDB().Model(&info).Where("warehouse_info_id  = ? and good_id = ? and status = 1", id, goodid).Find(&info).Error
 	return info, err
 }
 
+func GetAllCancelInfoById(id int64, goodid int64) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("warehouse_info_id  in(?) and good_id = ? and status = 1", id, goodid).Find(&info).Error
+	return info, err
+}
+
 func UpdateStockFlow(flow models.VmStockFlow, goodid int64, warehousing_id int64) error {
 
 	err := XTWriteDB().Model(&flow).Where("good_id = ? and warehousing_id= ? and status = 1", goodid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count}).Error
@@ -4560,6 +4745,13 @@ func UpdateDrugFlow(flow models.DrugFlow, drugid int64, warehousing_id int64) er
 	return err
 }
 
+func UpdateDrugFlowTen(flow models.DrugFlow, drugid int64, warehousing_id int64) error {
+
+	drugFlow := models.DrugFlow{}
+	err := XTWriteDB().Model(&drugFlow).Where("drug_id = ? and warehousing_id= ? and status = 1", drugid, warehousing_id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "number": flow.Number, "batch_number": flow.BatchNumber, "price": flow.Price}).Error
+	return err
+}
+
 func UpdateDrugCancel(id int64) (models.DrugCancelStock, error) {
 
 	stock := models.DrugCancelStock{}
@@ -5091,6 +5283,22 @@ func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.V
 	return err
 }
 
+func UpdatedStockFlowByGoodIdOne(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber}).Error
+	return err
+}
+
+func UpdateStockFlowByDetailId(flow models.VmStockFlow, wareoutdetailid int64) error {
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_detail_id = ? and status = 1", wareoutdetailid).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "price": flow.Price}).Error
+	return err
+}
+
+func UpdatedGoodInfo(info models.GoodInfo, goodid int64) error {
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", goodid).Updates(map[string]interface{}{"manufacturer": info.Manufacturer, "dealer": info.Dealer}).Error
+	return err
+}
+
 func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
 
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
@@ -5103,13 +5311,6 @@ func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, e
 	return info, err
 }
 
-func GetDrugWarehouseingInfo(id int64) (models.XtDrugWarehouseInfo, error) {
-
-	info := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
-	return info, err
-}
-
 func UpdateDrugWarehouseingInfoSix(id int64, info models.XtDrugWarehouseInfo) error {
 
 	warehouseInfo := models.XtDrugWarehouseInfo{}
@@ -5123,12 +5324,6 @@ func CreatedCancelStock(info models.DrugCancelStockInfo) error {
 	return err
 }
 
-func UpdateDrugCancelStockInfo(info *models.DrugCancelStockInfo) error {
-
-	err := XTWriteDB().Save(&info).Error
-	return err
-}
-
 func IsExsitStockFlow(goodid int64, cancel_order_number string) (*models.VmStockFlow, error) {
 	flow := models.VmStockFlow{}
 	err := XTReadDB().Where("good_id = ? and cancel_order_number = ? and status = 1", goodid, cancel_order_number).Find(&flow).Error
@@ -5146,3 +5341,24 @@ func UpdateStockFlowTwo(id int64, flow models.VmStockFlow) error {
 	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count}).Error
 	return err
 }
+
+func UpdateStockFlowThree(id int64, flow models.VmStockFlow) error {
+
+	err := XTWriteDB().Model(&flow).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"count": flow.Count, "manufacturer": flow.Count, "dealer": flow.Dealer, "number": flow.Number, "license_number": flow.LicenseNumber, "price": flow.Price}).Error
+	return err
+}
+
+func GetLastWarehouseOutInfoById(drugid int64) (models.DrugWarehouseOutInfo, error) {
+
+	flow := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Where("drug_id = ? and status = 1", drugid).Last(&flow).Error
+	return flow, err
+}
+
+func GetLastWarehoseByGoodId(goodid int64, patient_id int64, record_date int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Model(&info).Where("good_id = ? and patient_id = ? and sys_record_time = ? and status = 1", goodid, patient_id, record_date).First(&info).Error
+
+	return info, err
+}

service/warhouse_service.go

@@ -89,9 +89,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-	fmt.Println("c出库数量", advice.PrescribingNumber)
-	fmt.Println("单位1", advice.PrescribingNumberUnit)
-	fmt.Println("单位2", drup.MaxUnit)
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -124,10 +121,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
-	fmt.Println("hhh2322333232333232322332323232323232", warehouse.StockMaxNumber, drup.MinNumber, warehouse.StockMinNumber)
+
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("剩余库存🇨🇳2222222222222222222", stock_number)
-	fmt.Println("deliver_number88888888888", deliver_number)
 
 	//查找药品信息
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
@@ -160,8 +155,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseInfoId:         warehouse.ID,
 		}
 
-		fmt.Println("单据号2232322323232323232323232323232323", warehouseout.WarehouseOutOrderNumber)
-
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
@@ -225,7 +218,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
-		fmt.Println("2332233232232323232323", advice.PrescribingNumberUnit, drup.MaxUnit)
 		//if advice.PrescribingNumberUnit == drup.MaxUnit {
 		//	maxNumber = deliver_number / drup.MinNumber
 		//	minNumber = deliver_number % drup.MinNumber
@@ -238,15 +230,13 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
-		fmt.Println("maxNumber0000000000000", maxNumber)
-		fmt.Println("minNumber999999999999999", minNumber)
+
 		if warehouse.StockMaxNumber < maxNumber {
 
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		fmt.Println("扣减库存2322223232332233223232323233233223", warehouse.StockMaxNumber)
 
 		warehouse.Mtime = time.Now().Unix()
 
@@ -326,8 +316,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			return errTwo
 		}
 
-		fmt.Println("hh23232323232323232233232", warehouse.ID)
-
 		info := models.XtDrugWarehouseInfo{
 			ID:                warehouse.ID,
 			WarehousingId:     warehouse.WarehousingId,
@@ -388,12 +376,10 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		}
 
 		CreateDrugFlowOne(drugflow)
-		fmt.Println("deliver_number4444444444444", deliver_number)
-		fmt.Println("剩余库存hhh2332323232233223232323", stock_number)
+
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
 
-		fmt.Println("下哥批次要出的库存数控数量23333322222222222232323233322332", prescribingNumber_two_temp)
 		overPlusNumber := float64(prescribingNumber_two_temp)
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
@@ -501,7 +487,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
-	fmt.Println("warehouse233223232323", warehouse.ID)
+
 	//查找药品信息
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 	if err != nil {
@@ -513,9 +499,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
-	fmt.Println("剩余库存", stock_number)
-	fmt.Println("出库数量233322323", deliver_number)
-
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -605,15 +588,12 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		fmt.Println("单位1111111", advice.PrescribingNumberUnit)
-		fmt.Println("单位232323233223", drup.MinUnit)
-		fmt.Println("出库数量", deliver_number)
+
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
-		fmt.Println("剩余库存233233232323323232")
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < maxNumber {
@@ -621,18 +601,11 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			}
 		}
 
-		fmt.Println("库存数量2332232323", stock_number)
-		fmt.Println("c出库数量", maxNumber)
-		fmt.Println("c出库数量", minNumber)
-
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
 		}
-		fmt.Println("剩余库存", warehouse.StockMaxNumber)
 
-		fmt.Println("ha1", warehouse.StockMinNumber)
-		fmt.Println("ha2", minNumber)
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
@@ -652,7 +625,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		//扣减库存232332332332
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+
 		if errThree != nil {
 			return errThree
 		}
@@ -768,8 +741,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
 
-		fmt.Println("剩余出库数量4444444444444444", prescribingNumber_two_temp)
-
 		overPlusNumber := float64(prescribingNumber_two_temp)
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
@@ -789,9 +760,6 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 
-	fmt.Println("单位1", advice.CountUnit)
-	fmt.Println("单位2", drup.MaxUnit)
-
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
 	} else {
@@ -847,8 +815,8 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		fmt.Println("hh233223323223232323233223232323233223232323", warehouseout.ID, warehouseout.WarehouseOutOrderNumber)
-		//list, _ := GetLastWarehouseOut(drup.OrgId)
+
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -869,6 +837,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			IsEdit:                  1,
 			Creator:                 0,
 			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -941,7 +910,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		//list, _ := GetLastWarehouseOut(drup.OrgId)
+		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -962,6 +931,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			IsEdit:                  1,
 			Creator:                 0,
 			IsSys:                   0,
+			WarehouseOutDetailId:    drugWareInfo.ID,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
@@ -1024,8 +994,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("goods222222222222", goods)
-	fmt.Println("goodsy999999999999", goods_yc)
+
 	if len(goods) > 0 {
 		out, err := FindStockOutByIsSys(orgID, 1, record_time)
 		if err == gorm.ErrRecordNotFound {
@@ -1195,7 +1164,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 
-			fmt.Println("什么数据233232323", errflow)
 			if errflow == gorm.ErrRecordNotFound {
 				errThre := CreateStockFlowOne(flow)
 				if errThre != nil {
@@ -1322,7 +1290,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 
 		return nil
 	} else {
-		fmt.Println("不进来22323232323232323232233223323223322323")
+
 		// 当刚批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1349,7 +1317,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		warehouseOutInfo.Count = stock_number
 
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, goods.PatientId, record_time)
-		fmt.Println("hhhhh2h323233223232323", errcodes)
+
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 
@@ -1418,7 +1386,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 
 		} else if errcodes == nil {
-			fmt.Println("尽力3323232322323232323232323232323")
+
 			goods.Count = deliver_number - stock_number
 			//更新数量为  该批次剩余数量  + 还有未出的数量
 			warehouseOutInfo.Count = stock_number
@@ -1453,7 +1421,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			if errflows == gorm.ErrRecordNotFound {
 				CreateStockFlowOne(flow)
 			} else if errflows == nil {
-				fmt.Println("尽力3323232322323232323232323232323", exsit.Count+goods.Count)
+
 				flow := models.VmStockFlow{
 					ID:                      exsit.ID,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1623,21 +1591,17 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	var maxNumber int64 = 0
 
 	deliver_number = goods.Count
-	fmt.Println("出库数量", deliver_number)
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 
 	// 如果没有对应的库存，则报错
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
-
 	if err != nil {
 
 		return err
 	}
 
 	stock_number = warehouse.StockCount
-	fmt.Println("库存数量", stock_number)
-	fmt.Println("出库数量", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1707,8 +1671,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		maxNumber = goods.Count
 
-		fmt.Println("数据1111111111111", warehouse.StockCount)
-		fmt.Println("s数据233232323232323232233232", maxNumber)
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
 		}
@@ -1718,7 +1680,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		//扣减库存
 		errThree := UpDateWarehouseInfoByStock(&warehouse)
-		fmt.Println("几年里2323323232323232323232")
+
 		if errThree != nil {
 			return errThree
 		}
@@ -1768,7 +1730,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			GoodId:                  goods.GoodId,
 			Number:                  warehouse.Number,
 			LicenseNumber:           goods.LicenseNumber,
-			Count:                   goods.Count,
+			Count:                   stock_number,
 			UserOrgId:               goods.OrgId,
 			PatientId:               0,
 			SystemTime:              record_time,
@@ -1823,15 +1785,15 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 	var maxNumber int64 = 0
 
 	deliver_number = goods.Count
-	fmt.Println("添加数量", deliver_number)
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	warehouse, err := FindFirstWarehousingInfoByGoodId(goods.GoodId, goods.ID)
+
 	if err != nil {
 		return err
 	}
+
 	stock_number = warehouse.StockCount
-	fmt.Println("hh233232232323323232322323233", stock_number, deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1919,10 +1881,10 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 		if errThree != nil {
 			return errThree
 		}
-		fmt.Println("我的时间h232323332323223232323322332322323323223233223232323232332232332232323", errThree)
+
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
-		fmt.Println("hh23323232232332232323233232323223223", goods.Count)
+
 		ConsumablesDeliveryTwo(orgID, goods, count)
 
 	}
@@ -1972,10 +1934,8 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
-	fmt.Println("hhh2322333232333232322332323232323232", warehouse.StockMaxNumber, drup.MinNumber, warehouse.StockMinNumber)
+
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("剩余库存🇨🇳2222222222222222222", stock_number)
-	fmt.Println("deliver_number88888888888", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -2004,8 +1964,6 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			WarehouseInfoId:         warehouse.ID,
 		}
 
-		fmt.Println("单据号2232322323232323232323232323232323", warehouseout.WarehouseOutOrderNumber)
-
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
@@ -2067,23 +2025,19 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
 
-		fmt.Println("2332233232232323232323", advice.PrescribingNumberUnit, drup.MaxUnit)
-
 		//将拆零数量转为 最大包装单位  和 最小单位
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
-		fmt.Println("maxNumber0000000000000", maxNumber)
-		fmt.Println("minNumber999999999999999", minNumber)
+
 		if warehouse.StockMaxNumber < maxNumber {
 
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		fmt.Println("扣减库存2322223232332233223232323233233223", warehouse.StockMaxNumber)
 
 		warehouse.Mtime = time.Now().Unix()
 
@@ -2167,7 +2121,6 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		//warehouse.StockMaxNumber = 0
 		//warehouse.StockMinNumber = 0
 		//warehouse.Mtime = time.Now().Unix()
-		fmt.Println("hh23232323232323232233232", warehouse.ID)
 
 		info := models.XtDrugWarehouseInfo{
 			ID:                warehouse.ID,
@@ -2228,12 +2181,10 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		CreateDrugFlowOne(drugflow)
-		fmt.Println("deliver_number4444444444444", deliver_number)
-		fmt.Println("剩余库存hhh2332323232233223232323", stock_number)
+
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
 
-		fmt.Println("下哥批次要出的库存数控数量23333322222222222232323233322332", prescribingNumber_two_temp)
 		overPlusNumber := float64(prescribingNumber_two_temp)
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
@@ -2285,8 +2236,6 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("第二次拆零数量2222222222222222222", stock_number)
-	fmt.Println("第二次出库数量55555555555555555555", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -2403,7 +2352,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		fmt.Println("我你233232323232323332323232232332322323233232232323")
+
 		if errThree != nil {
 			return errThree
 		}