11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -756,8 +756,18 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
 				item.OrgId = item.OrgId
-
-				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, item)
+				warehouseinfo := &models.DrugWarehouseInfo{
+					Number:       item.Number,
+					ProductDate:  item.ProductDate,
+					ExpiryDate:   item.ExpiryDate,
+					Price:        item.Price,
+					TotalPrice:   item.TotalPrice,
+					Dealer:       item.Dealer,
+					Manufacturer: item.Manufacturer,
+					Remark:       item.Remark,
+					BatchNumber:  item.BatchNumber,
+				}
+				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
 			}
 		}
 	}
@@ -1575,9 +1585,10 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminUserInfo.CurrentOrgId)
 
 	tempWarehouseOut := models.DrugWarehouseOut{
-		ID:               warehouseOut.ID,
-		Mtime:            mtime,
-		WarehouseOutTime: warehouseOutDate.Unix(),
+		ID:                      warehouseOut.ID,
+		Mtime:                   mtime,
+		WarehouseOutTime:        warehouseOutDate.Unix(),
+		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 	}
 
 	service.EditDrugWarehouseOut(tempWarehouseOut)
@@ -1859,8 +1870,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				})
 				return
 			} else {
-				errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-				service.CreateDrugFlow(drugFlow)
+				//errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+				//service.CreateDrugFlow(drugFlow)
 				// 出库流程
 				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1975,7 +1986,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				cha_number = min_number - max_number
 				//如果总库存大于差,正常出库
-				if all_number >= cha_number {
+				if all_number > cha_number {
 
 					errs = service.UpDateDrugWarehouseOutInfo(item)
 
@@ -2036,7 +2047,36 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						})
 					}
 				}
+				if all_number == cha_number {
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						Number:       item.Number,
+						ProductDate:  item.ProductDate,
+						ExpiryDate:   item.ExpiryDate,
+						Price:        item.Price,
+						TotalPrice:   item.TotalPrice,
+						Dealer:       item.Dealer,
+						Manufacturer: item.Manufacturer,
+						Remark:       item.Remark,
+						BatchNumber:  item.BatchNumber,
+						MaxUnit:      item.CountUnit,
+					}
+					parseDateErr := service.UpdateDrugWarehouseingInfoSix(item.ID, warehouseInfo)
+					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 all_number < cha_number {
 					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2305,29 +2345,29 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//查询该批次总的退库数量
 		canInfo, _ := service.GetCancelDrugStockOutInfo(item.BatchNumberId, item.DrugId)
 
-		for _, item := range canInfo {
-			if item.MaxUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+		for _, it := range canInfo {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.MaxUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.MaxUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
 
-		for _, item := range canInfo {
-			can_number += item.Count
+		for _, it := range canInfo {
+			can_number += it.Count
 		}
 
-		for _, item := range outInfo {
-			if item.CountUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+		for _, it := range outInfo {
+			if it.CountUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.CountUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.CountUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
-		for _, item := range outInfo {
-			out_number += item.Count
+		for _, it := range outInfo {
+			out_number += it.Count
 		}
 
 		if out_number == 0 {
@@ -2338,7 +2378,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			return
 		}
 
-		fmt.Println("hhhh233323232322323", total_number, total_count)
+		fmt.Println("时间任命323332233232", total_number, total_count)
 
 		//判断退库数量是否大于总入库数量
 		if total_number > total_count {
@@ -2366,9 +2406,42 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
-			errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+			errs := service.CreateCancelStockInfoTwo(item)
 			//创建库存明细
-			errs = service.CreateDrugFlow(drugFlow)
+			flows := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  item.DrugId,
+				Number:                  "",
+				BatchNumber:             item.BatchNumber,
+				Count:                   item.Count,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				PatientId:               0,
+				SystemTime:              ctime,
+				ConsumableType:          4,
+				IsSys:                   0,
+				WarehousingOrder:        infoWareInfo.WarehousingOrder,
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            manufacturer_id,
+				Dealer:                  dealer_id,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              item.ExpiryDate,
+				ProductDate:             item.ProductDate,
+				MaxUnit:                 item.MaxUnit,
+				MinUnit:                 "",
+			}
+			errs = service.CreateDrugFlowOne(flows)
 
 			var total int64
 
@@ -2407,6 +2480,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				})
 			}
 		}
+
 	}
 }
 func (c *StockDrugApiController) GetDrugCancelStockInfoList() {

controllers/stock_in_api_controller.go

@@ -2121,10 +2121,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				service.AddSigleCancelStock(&cancelStock)
 			}
 			listcancel, _ := service.GetLastCancelStockById(adminUserInfo.CurrentOrgId)
-			for _, it := range cancelStockInfos {
-				it.CancelStockId = listcancel.ID
-			}
-			errs := service.CreateCancelStockInfo(cancelStockInfos)
+
+			fmt.Println("2332323232323232323", cancelStockInfos)
+			item.CancelStockId = listcancel.ID
+			errs := service.CreateCancelStockInfoOne(item)
+
 			if len(stockFLow) > 0 {
 				service.CreateStockFlow(stockFLow)
 			}
@@ -2144,6 +2145,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			}
 			//更改入库数量
 			errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
+			if err != nil {
+				utils.ErrorLog(err.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
 		}
 	}
 
@@ -4603,9 +4609,11 @@ func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 	ids := this.GetString("id")
 	idsArray := strings.Split(ids, ",")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":  list,
+		"order": order,
 	})
 }
 

models/dialysis.go

@@ -863,7 +863,7 @@ type XtDialysisOrders struct {
 	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
 	Number         string `gorm:"column:number" json:"number" form:"number"`
-	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }

models/drug_stock.go

@@ -325,6 +325,7 @@ type StDrugWarehouseOutInfo struct {
 	LastPrice               string  `json:"last_price"`
 	PackingUnit             string  `json:"packing_unit"`
 	Dosage                  int64   `json:"dosage"`
+	ExpireDate              int64   `json:"expire_date"`
 }
 
 type DrugFlow struct {

service/stock_service.go

@@ -604,7 +604,7 @@ func GetDrugByWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 func UpdateDrugWarehouseingInfo(id int64, info models.XtDrugWarehouseInfo) error {
 
 	warehouseInfo := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
 	return err
 }
 
@@ -1605,6 +1605,18 @@ func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error
 
 }
 
+func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
 func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1913,7 +1925,7 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
 }
 
 func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err error) {
-	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"org_id": info.OrgId}).Error
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber}).Error
 	return err
 }
 
@@ -3516,7 +3528,7 @@ func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user
 	db = db.Preload("GoodsType", "status = 1")
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
 	db = db.Preload("WarehouseOutInfo", "org_id = ? and status = 1 and good_id = ? and sys_record_time = ?", org_id, good_id, record_time)
-	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? ", org_id, good_id, record_time)
+	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? and count<> 0 ", org_id, good_id, record_time)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 
@@ -4000,7 +4012,7 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date as expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 
@@ -5057,3 +5069,10 @@ func GetDrugWarehouseingInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	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{}
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit}).Error
+	return err
+}

service/warhouse_service.go

@@ -836,14 +836,15 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		list, _ := GetLastWarehouseOut(drup.OrgId)
+		fmt.Println("hh233223323223232323233223232323233223232323", warehouseout.ID, warehouseout.WarehouseOutOrderNumber)
+		//list, _ := GetLastWarehouseOut(drup.OrgId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          list.ID,
+			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
-			ProductDate:             warehouse.ProductDate,
-			ExpireDate:              warehouse.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
 			Price:                   advice.Price,
 			Status:                  1,
@@ -929,14 +930,14 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		list, _ := GetLastWarehouseOut(drup.OrgId)
+		//list, _ := GetLastWarehouseOut(drup.OrgId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          list.ID,
+			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
-			ProductDate:             warehouse.ProductDate,
-			ExpireDate:              warehouse.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
 			Price:                   advice.Price,
 			Status:                  1,