11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -2229,10 +2229,10 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						SupplyWarehouseId: id,
 					}
 					//查询今日是否存在入库单号
-					_, errcode := service.GetSingleDrugWarehouseOrder(record_date, orgId)
-					if errcode == gorm.ErrRecordNotFound {
-						service.AddSigleDrugWarehouse(&warehousing)
-					}
+					//_, errcode := service.GetSingleDrugWarehouseOrder(record_date, orgId)
+					//if errcode == gorm.ErrRecordNotFound {
+					service.AddSigleDrugWarehouse(&warehousing)
+					//}
 					drugWarehouseInfo, _ := service.GetLastDrugWarehouse(orgId)
 
 					warehouseInfoDetailOne := &models.DrugWarehouseInfo{
@@ -2330,10 +2330,10 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						SupplyWarehouseId: id,
 					}
 					//查询是否存在入库单
-					_, errcose := service.GetSindleWarehouse(record_date, orgId)
-					if errcose == gorm.ErrRecordNotFound {
-						service.AddSigleWarehouse(&warehousing)
-					}
+					//_, errcose := service.GetSindleWarehouse(record_date, orgId)
+					//if errcose == gorm.ErrRecordNotFound {
+					service.AddSigleWarehouse(&warehousing)
+					//}
 					info, _ := service.GetLastWarehouseInfoByInfo(orgId)
 
 					//入库单表格
@@ -2369,6 +2369,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 
 	for _, item := range warehousingInfo {
 		service.CreatedWarehouseingDetail(item)
+		service.ModifyGoodAddInformation(item.GoodId, item.StockCount, item.OrgId)
 		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
 		flow := models.VmStockFlow{
 			WarehousingOrder:          item.WarehousingOrder,
@@ -2397,9 +2398,18 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 	}
 	//创建入库单
 	errs := service.CreateDrugWarehousingInfoSix(warehouseInfoDetail)
-
 	//改变入库状态
-
+	for _, items := range warehouseInfoDetail {
+		medical, _ := service.GetBaseDrugMedical(items.DrugId)
+		if items.MaxUnit == medical.MaxUnit {
+			var sum_count int64
+			sum_count = items.WarehousingCount * medical.MinNumber
+			service.ModifyDrugAddInformation(items.DrugId, sum_count, items.OrgId)
+		}
+		if items.MaxUnit == medical.MinUnit {
+			service.ModifyDrugAddInformation(items.DrugId, items.WarehousingCount, items.OrgId)
+		}
+	}
 	fmt.Println(errs)
 	for _, items := range drugFlow {
 		drugWarehouseInfo, _ := service.GetLastDrugWarehouseInfo(items.DrugId)
@@ -3116,7 +3126,7 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 			}
 		}
 		if it.IsSource == 2 {
-			fmt.Println("hh23323233232232332232323232332", it.WarehouseOutId)
+
 			out, _ := service.GetGoodWarehouseInfoByWarehousingId(it.ProjectId, id, orgId)
 			if out.ID > 0 {
 				this.ServeSuccessJSON(map[string]interface{}{
@@ -3165,16 +3175,34 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		if len(goodList) == 0 {
 			service.UpdateGoodWarehousing(id, orgId)
 		}
+
+		// 查询入库单
+		drugInfo, _ := service.GetDrugSupplyWarehouseId(id, orgId)
+		if drugInfo.StockMaxNumber > 0 {
+			medical, _ := service.GetBaseDrugMedical(drugInfo.DrugId)
+			var stock_count int64
+			stock_count = drugInfo.StockMaxNumber * medical.MinNumber
+			service.ModifyDrugReduceInformation(drugInfo.DrugId, stock_count, drugInfo.OrgId)
+		}
+		if drugInfo.StockMinNumber > 0 {
+			service.ModifyDrugReduceInformation(drugInfo.DrugId, drugInfo.StockMinNumber, drugInfo.OrgId)
+		}
 		//删除药品入库单
 		service.UpdateDrugSupplyWarehousingInfo(id, orgId)
+
 		//删除入库流水
 		service.UpdateDrugSupplyFlow(id, orgId)
 
+		//查寻入库单
+		info, _ := service.GetSupplySupplyWarehouseId(id, orgId)
+		//扣减库存
+		service.ModifyGoodReduceInformation(info.GoodId, info.StockCount, info.OrgId)
 		//删除耗材入库单
 		service.UpdateGoodSupplyWarehousingInfo(id, orgId)
 
 		//删除耗材入库流水
 		service.UpdateGoodSupplyFlow(id, orgId)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"cancelList":   cancelList,
@@ -3293,7 +3321,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 	//获取退库单详情
 	list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
 	for _, item := range list {
-		fmt.Println("itme.233232323232323232323232323232232332", item.Type)
+
 		var total_count int64
 		var prescribing_number_total int64
 		//药品

service/supply_service.go

@@ -758,6 +758,18 @@ func UpdateSupplyGoodOrder(id int64, out models.SpSupplierWarehouseOut) error {
 	return err
 }
 
+func GetSupplySupplyWarehouseId(id int64, orgid int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func GetDrugSupplyWarehouseId(id int64, orgid int64) (models.DrugWarehouseInfo, error) {
+	info := models.DrugWarehouseInfo{}
+	err := XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
 func UpdateDrugSupplyWarehousingInfo(id int64, orgid int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error