11月8日库存管理

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -106,6 +106,7 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 	endtime := this.GetString("end_time")
 	enddate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endtime)
 	enddateunix := enddate.Unix()
+
 	scheduledate, _ := this.GetInt64("schedule_date")
 	zoneid, _ := this.GetInt64("zone_id")
 	patientid, _ := this.GetInt64("patient_id")

controllers/stock_in_api_controller.go

@@ -342,6 +342,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 	info, _ := service.FindLastWarehousingInfo(warehousing.WarehousingOrder)
 
 	for _, item := range warehousingInfo {
+
 		goodInfo, _ := service.GetGoodInformationByGoodId(item.GoodId)
 		str := strconv.FormatInt(item.WarehousingCount, 10)
 		minFloat, _ := strconv.ParseFloat(str, 64)
@@ -350,9 +351,9 @@ func (c *StockManagerApiController) CreateWarehouse() {
 			Total: minFloat + goodInfo.Total,
 		}
 		//更该库存
-		parseDateErr := service.UpdateGoodInfoList(good, goodInfo.ID)
-		break
-		fmt.Println(parseDateErr)
+		service.UpdateGoodInfoList(good, item.GoodId)
+
+		service.ModifyGoodAddInformation(item.GoodId, item.WarehousingCount, item.OrgId)
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -701,6 +702,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				Total: good.Total + total,
 			}
 			errcodescode = service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+			service.ModifyGoodReduceInformation(info.GoodId, info.WarehousingCount, info.OrgId)
 			fmt.Println(errcodescode)
 		}
 	}
@@ -732,18 +734,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 
-				//flowStock := models.VmStockFlow{
-				//	Count:         item.WarehousingCount,
-				//	Number:        item.Number,
-				//	ProductDate:   item.ProductDate,
-				//	ExpireDate:    item.ExpiryDate,
-				//	Price:         item.Price,
-				//	Manufacturer:  item.Manufacturer,
-				//	Dealer:        item.Dealer,
-				//	LicenseNumber: info.LicenseNumber,
-				//}
-				//fmt.Println("大于233232322323233232232323233232233223")
-				//service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flowStock)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)

controllers/supply_order_api_contorller.go

@@ -3075,11 +3075,14 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 				service.CreateCancelReturnOrder(item)
 			}
 		}
+		list, err := service.GetReturnCancelOrderList(warehouse_out_id, orgId)
 		if err == nil {
-			returnData := make(map[string]interface{}, 0)
-			returnData["msg"] = "ok"
-			this.ServeSuccessJSON(returnData)
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list": list,
+				"msg":  "msg",
+			})
 			return
+
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		}

models/good_models.go

@@ -86,6 +86,8 @@ type GoodInfo struct {
 	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	Number                      string               `gorm:"column:number" json:"number" form:"number"`
 	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	SumCount                    int64                `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
 }
 
 func (GoodInfo) TableName() string {

service/stock_service.go

@@ -5795,3 +5795,20 @@ func GetAllDrugFlowById(drugid int64, patient_id int64, advicedate int64, orgid
 	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", drugid, patient_id, advicedate, orgid).Find(&info).Error
 	return info, err
 }
+
+//耗材加库存
+func ModifyGoodAddInformation(good_id int64, sum_count int64, orgid int64) (models.GoodInfo, error) {
+
+	info := models.GoodInfo{}
+
+	err = XTWriteDB().Model(&info).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+	return info, err
+}
+
+func ModifyGoodReduceInformation(good_id int64, sum_count int64, orgid int64) (models.GoodInfo, error) {
+
+	info := models.GoodInfo{}
+
+	err = XTWriteDB().Model(&info).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", sum_count)).Error
+	return info, err
+}