耗材参数

controllers/stock_in_api_controller.go

@@ -1173,6 +1173,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				expiry_date := items["expiry_date"].(string)
 
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				var expiryDate int64
@@ -1216,6 +1217,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					ProductDate:             productDate,
 					Dealer:                  dealer,
 					LicenseNumber:           license_number,
+					WarehouseInfotId:        warehouse_info_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1240,9 +1242,13 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	//出库逻辑
 	for _, item := range warehousingOutInfo {
 		//查询库存
-		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		//warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		//查询该批次的库存
 
-		if item.Count > warehouse.Count {
+		warehouseOne, _ := service.FindWarehousingInfoByIdSeven(item.WarehouseInfotId)
+		fmt.Println("数据232323232323232323323232", warehouseOne)
+		fmt.Println("库存查询23322332233232233232322323232323", warehouseOne.StockCount)
+		if item.Count > warehouseOne.StockCount {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
@@ -1250,6 +1256,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				"specification_name": goodObj.SpecificationName,
 			})
 			return
+
 		} else {
 
 			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)

main.go

@@ -16,8 +16,8 @@ func main() {
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
-	// service.BeginAutoCreateDrugJob()
-	// service.BeginAutoCreateStockJob()
+	//service.BeginAutoCreateDrugJob()
+	service.BeginAutoCreateStockJob()
 	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()
 }

service/auto_create_stock.go

@@ -44,17 +44,36 @@ func AutoCreateStockJob() {
 
 		information, _ := FindAlLGoodInformation(item.UserOrgId)
 		for _, ite := range information {
-			countList, _ := FindAllGoodInformationTotalCount(ite.ID)
-			for _, it := range countList {
-				if ite.ID == it.GoodId {
-					formatInt := strconv.FormatInt(it.StockCount, 10)
-					total, _ := strconv.ParseFloat(formatInt, 64)
-					info := models.GoodInfo{
-						Total: total,
-					}
-					UpdateStockTotal(it.GoodId, info)
-				}
+			//countList, _ := FindAllGoodInformationTotalCount(ite.ID)
+			//查询入库数量
+			warehouseInfo, _ := FindAllGoodWarehouseInfoCount(ite.ID)
+
+			//查询自动出库数量
+			autoWarehouseOut, _ := FindAutoGoodWarehouseInfoCount(ite.ID)
+
+			//查询手动出库
+			warehouseOut, _ := FindGoodWarehouseOutCount(ite.ID)
+
+			var total int64
+
+			total = warehouseInfo.WarehousingCount - autoWarehouseOut.Count - warehouseOut.Count
+			formatInt := strconv.FormatInt(total, 10)
+			totalfloat, _ := strconv.ParseFloat(formatInt, 64)
+			info := models.GoodInfo{
+				Total: totalfloat,
 			}
+			UpdateStockTotal(ite.ID, info)
+
+			//for _, it := range countList {
+			//	if ite.ID == it.GoodId {
+			//		formatInt := strconv.FormatInt(it.StockCount, 10)
+			//		total, _ := strconv.ParseFloat(formatInt, 64)
+			//		info := models.GoodInfo{
+			//			Total: total,
+			//		}
+			//		UpdateStockTotal(it.GoodId, info)
+			//	}
+			//}
 		}
 
 	}
@@ -85,3 +104,36 @@ func UpdateStockTotal(id int64, lib models.GoodInfo) error {
 	err := XTWriteDB().Model(&lib).Where("id=? and status = 1", id).Updates(map[string]interface{}{"total": lib.Total}).Error
 	return err
 }
+
+func FindAllGoodWarehouseInfoCount(good_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.warehousing_count <> 0", good_id)
+	}
+	err = db.Select("x.good_id,sum(x.warehousing_count) as warehousing_count").Find(&info).Error
+	return info, err
+}
+
+func FindAutoGoodWarehouseInfoCount(good_id int64) (models.AutomaticReduceDetail, error) {
+
+	detail := models.AutomaticReduceDetail{}
+	db := XTReadDB().Table("xt_automatic_reduce_detail as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.count<> 0", good_id)
+	}
+	err := db.Select("x.good_id,sum(x.count) as count").Find(&detail).Error
+	return detail, err
+}
+
+func FindGoodWarehouseOutCount(good_id int64) (models.WarehouseOutInfo, error) {
+
+	out := models.WarehouseOutInfo{}
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ? and x.is_sys = 0 and x.count<> 0", good_id)
+	}
+	err := db.Select("x.good_id,sum(x.count) as count").Find(&out).Error
+	return out, err
+}

service/stock_service.go

@@ -623,6 +623,12 @@ func FindFirstWarehousingInfoByStockTwo(good_id int64, good_type_id int64) (info
 	return info, err
 }
 
+func FindWarehousingInfoByIdSeven(id int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Model(&info).Where("id= ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
 //药品先进先出,找出最先入库的批次
 
 func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {