11月8日库存管理

controllers/drug_stock_api_contorller.go

@@ -654,7 +654,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					IsSys:            0,
 				}
 				_, existerrcodes := service.GetDrugFlowIsExist(info.ID, info.DrugId)
-				fmt.Println("23323232232323我的时间232332332232332322323232", existerrcodes)
+
 				if existerrcodes == gorm.ErrRecordNotFound {
 					service.CreateDrugFlowOne(flows)
 				}
@@ -718,7 +718,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			if item.WarehousingCount > warehouseInfo.WarehousingCount {
 				total = item.WarehousingCount - warehouseInfo.WarehousingCount
 				item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
-				fmt.Println("我的世界hhh23323232333232323", item.StockMaxNumber)
+
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
@@ -728,14 +728,17 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						}
 						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
 						fmt.Println(parseDateErr)
+
 					}
 				}
+				break
 			}
 
 			// 如果当前的入库数量 小于 历史入库数量
 			if item.WarehousingCount < warehouseInfo.WarehousingCount {
 				total = warehouseInfo.WarehousingCount - item.WarehousingCount
 				item.StockMaxNumber = warehouseInfo.StockMaxNumber - total
+
 				errs = service.UpDateDrugWarehousingInfo(item)
 				if len(drugFlow) > 0 {
 					for _, it := range drugFlow {
@@ -747,6 +750,12 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						fmt.Println(parseDateErr)
 					}
 				}
+				break
+			}
+
+			if item.WarehousingCount == warehouseInfo.WarehousingCount {
+				errs = service.UpDateDrugWarehousingInfo(item)
+				break
 			}
 		}
 	}

controllers/his_api_controller.go

@@ -633,115 +633,114 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
 
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-
-	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-
-	if drugStockConfig.IsOpen == 1 {
-		//校验库存总量
-		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-			prescriptions, _ := dataBody["prescriptions"].([]interface{})
-			if len(prescriptions) > 0 {
-				for _, item := range prescriptions {
-					items := item.(map[string]interface{})
-					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-						advices := items["advices"].([]interface{})
-						if len(advices) > 0 {
-							for _, advice := range advices {
-								var drug_id int64
-								var prescribing_number float64
-								var prescribingNumberUnit string
-
-								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
-									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
-								}
-								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
-									//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
-									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
-
-								}
-
-								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
-									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
-								}
-
-								drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
-								if drug.ID == 0 {
-									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-									return
-								}
-
-								if prescribingNumberUnit == drug.MinUnit {
-									if prescribing_number > drug.Total {
-										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-										return
-									}
-								} else {
-									if prescribingNumberUnit == drug.MaxUnit {
-										num := prescribing_number * float64(drug.MinNumber)
-										if num > drug.Total {
-											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-											return
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if stockConfig.IsOpen == 1 {
-		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-			prescriptions, _ := dataBody["prescriptions"].([]interface{})
-			if len(prescriptions) > 0 {
-				for _, item := range prescriptions {
-					items := item.(map[string]interface{})
-					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-						projects := items["project"].([]interface{})
-						if len(projects) > 0 {
-							for _, project := range projects {
-								var project_id int64
-								var project_type int64
-								var totals float64
-								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
-									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
-								}
-								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
-									project_type = int64(project.(map[string]interface{})["type"].(float64))
-								}
-								if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
-									total, _ := project.(map[string]interface{})["total"].(string)
-
-									totals, _ = strconv.ParseFloat(total, 64)
-								}
-								if project_type == 3 {
-									good, _ := service.FindGoodInfoByIdTwo(project_id)
-									if good.ID == 0 {
-										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-										return
-									}
-									if totals > good.Total {
-										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
-										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-										return
-									}
-
-								}
-
-							}
-						}
-					}
-				}
-			}
-		}
-
-	}
+	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//
+	//_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//
+	//if drugStockConfig.IsOpen == 1 {
+	//	//校验库存总量
+	//	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+	//		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+	//		if len(prescriptions) > 0 {
+	//			for _, item := range prescriptions {
+	//				items := item.(map[string]interface{})
+	//				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+	//					advices := items["advices"].([]interface{})
+	//					if len(advices) > 0 {
+	//						for _, advice := range advices {
+	//							var drug_id int64
+	//							var prescribing_number float64
+	//							var prescribingNumberUnit string
+	//
+	//							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+	//								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+	//							}
+	//							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+	//								//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
+	//								prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+	//								prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+	//
+	//							}
+	//
+	//							if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+	//								prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+	//							}
+	//
+	//							drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
+	//							if drug.ID == 0 {
+	//								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//								return
+	//							}
+	//
+	//							if prescribingNumberUnit == drug.MinUnit {
+	//								if prescribing_number > drug.Total {
+	//									c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+	//									//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+	//									return
+	//								}
+	//							} else {
+	//								if prescribingNumberUnit == drug.MaxUnit {
+	//									num := prescribing_number * float64(drug.MinNumber)
+	//									if num > drug.Total {
+	//										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+	//										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+	//										return
+	//									}
+	//								}
+	//							}
+	//						}
+	//					}
+	//				}
+	//			}
+	//		}
+	//	}
+	//}
+	//
+	//if stockConfig.IsOpen == 1 {
+	//	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+	//		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+	//		if len(prescriptions) > 0 {
+	//			for _, item := range prescriptions {
+	//				items := item.(map[string]interface{})
+	//				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+	//					projects := items["project"].([]interface{})
+	//					if len(projects) > 0 {
+	//						for _, project := range projects {
+	//							var project_id int64
+	//							var project_type int64
+	//							var totals float64
+	//							if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+	//								project_id = int64(project.(map[string]interface{})["project_id"].(float64))
+	//							}
+	//							if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
+	//								project_type = int64(project.(map[string]interface{})["type"].(float64))
+	//							}
+	//							if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
+	//								total, _ := project.(map[string]interface{})["total"].(string)
+	//
+	//								totals, _ = strconv.ParseFloat(total, 64)
+	//							}
+	//							if project_type == 3 {
+	//								good, _ := service.FindGoodInfoByIdTwo(project_id)
+	//								if good.ID == 0 {
+	//									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//									return
+	//								}
+	//								if totals > good.Total {
+	//									c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+	//									//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+	//									return
+	//								}
+	//
+	//							}
+	//
+	//						}
+	//					}
+	//				}
+	//			}
+	//		}
+	//	}
+	//}
 
 	info, _ := service.FindHisPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	var hpInfo models.HisPrescriptionInfo

controllers/stock_in_api_controller.go

@@ -634,7 +634,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 		for _, its := range warehousingInfo {
 			//查询
 			info, _ := service.GetLastGoodWarehouseInfo(its.GoodId)
-			fmt.Println("hh23323232323233232323322323", info)
 			flows := models.VmStockFlow{
 				WarehousingOrder:    info.WarehousingOrder,
 				WarehousingId:       info.ID,
@@ -657,7 +656,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				WarehousingDetailId: info.ID,
 			}
 			_, errcodescode := service.GetGoodStockFlowInfo(info.ID, info.GoodId)
-			fmt.Println("wodeshijehh23322333223233223323232", errcodescode)
+
 			if errcodescode == gorm.ErrRecordNotFound {
 				service.CreateStockFlowOne(flows)
 			}
@@ -721,7 +720,19 @@ func (c *StockManagerApiController) EditWarehouse() {
 					Total: good.Total - all_total,
 				}
 				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+
 			}
+
+			if item.WarehousingCount == info.WarehousingCount {
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount,
+					Price:            item.Price,
+				}
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
+				break
+			}
+
 		}
 	}
 

service/dialysis_service.go

@@ -1179,7 +1179,7 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count >0").Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count >0 and status = 1").Find(&goodinfo).Error
 	return goodinfo, err
 }
 

service/stock_service.go

@@ -4934,3 +4934,9 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount}).Error
 	return err
 }
+
+func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price}).Error
+	return err
+}

service/warhouse_service.go

@@ -615,7 +615,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		fmt.Println("库存数量2332232323", stock_number)
 		fmt.Println("c出库数量", maxNumber)
 		fmt.Println("c出库数量", minNumber)
-
+		return
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 
 		fmt.Println("剩余库存", warehouse.StockMaxNumber)