11月8日库存管理

controllers/gobal_config_api_controller.go

@@ -1904,7 +1904,7 @@ func (c *GobalConfigApiController) GetDrugStockFllow() {
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-
+	medical, _ := service.GetBaseDrugMedical(drug_id)
 	//查询入库数据
 	if stock_type == 3 || stock_type == 0 {
 		list, total, err := service.GetDrugStockFlow(drug_id, startTime, endTime, page, limit, orgId)
@@ -1916,6 +1916,7 @@ func (c *GobalConfigApiController) GetDrugStockFllow() {
 			"list":             list,
 			"total":            total,
 			"manufacturerList": manufacturerList,
+			"drug":             medical,
 		})
 	}
 
@@ -2192,11 +2193,13 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
+	medical, _ := service.GetBaseDrugMedical(drug_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
+		"drug":             medical,
 	})
 }
 

controllers/manager_center_api_controller.go

@@ -303,7 +303,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
-
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{

controllers/stock_in_api_controller.go

@@ -1258,7 +1258,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				var productDate int64
 				if len(product_date) > 0 {
-					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -1346,6 +1346,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			"good_name":          "",
 			"specification_name": "",
 		})
+		return
 	}
 }
 func (c *StockManagerApiController) GetWarehouseOutList() {
@@ -1573,7 +1574,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				var productDate int64
 				if len(product_date) > 0 {
-					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -1696,7 +1697,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-
+			fmt.Println("item2332323232323", item.ProductDate, item.ExpiryDate)
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId)
 

service/manage_service.go

@@ -799,25 +799,48 @@ func GetAllEquitName(orgid int64) (equiment []*models.DeviceEquimentname, err er
 
 func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
 
-	db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_patients as p")
-	fmt.Println("table", table)
-	dbs := UserReadDB().Table("sgj_user_admin_role as r")
-	fmt.Println("dbs", dbs)
-	offset := (page - 1) * limit
+	if orgId == 10060 {
+		db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_patients as p")
+		fmt.Println("table", table)
+		dbs := UserReadDB().Table("sgj_user_admin_role as r")
+		fmt.Println("dbs", dbs)
+		offset := (page - 1) * limit
+
+		if id > 0 {
+			db = db.Where("x.equiment_id = ?", id)
+		}
 
-	if id > 0 {
-		db = db.Where("x.equiment_id = ?", id)
-	}
+		if orgId > 0 {
+			db = db.Where("x.user_org_id = ?", orgId)
+		}
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
+		if err != nil {
+			return
+		}
+		return
+	} else {
+		db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_patients as p")
+		fmt.Println("table", table)
+		dbs := UserReadDB().Table("sgj_user_admin_role as r")
+		fmt.Println("dbs", dbs)
+		offset := (page - 1) * limit
+
+		if id > 0 {
+			db = db.Where("x.equiment_id = ?", id)
+		}
 
-	if orgId > 0 {
-		db = db.Where("x.user_org_id = ?", orgId)
-	}
-	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
-	if err != nil {
+		if orgId > 0 {
+			db = db.Where("x.user_org_id = ?", orgId)
+		}
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
+		if err != nil {
+			return
+		}
 		return
 	}
-	return
+
 }
 
 func GetBedNumber(id int64, orgid int64) (models.DeviceAddmacher, error) {

service/patient_service.go

@@ -1183,7 +1183,7 @@ func UpdateDoctorAdviceAndSubAdvice(m *models.DoctorAdvice) (err error) {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", m.ID).Updates(map[string]interface{}{"start_time": m.StartTime, "groupno": m.GroupNo, "mtime": time.Now().Unix()}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", m.ID).Updates(map[string]interface{}{"start_time": m.StartTime, "groupno": m.GroupNo, "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		ut.Rollback()
 		return

service/warhouse_service.go

@@ -1696,6 +1696,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		maxNumber = goods.Count
 
+		fmt.Println("数据1111111111111", warehouse.StockCount)
+		fmt.Println("s数据233232323232323232233232", maxNumber)
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
 		}
@@ -1703,14 +1705,11 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
 
-		if warehouse.StockCount <= 0 {
-			return errors.New("库存数量不足")
-		} else {
-			//扣减库存
-			errThree := UpDateWarehouseInfoByStock(&warehouse)
-			if errThree != nil {
-				return errThree
-			}
+		//扣减库存
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		fmt.Println("几年里2323323232323232323232")
+		if errThree != nil {
+			return errThree
 		}
 
 	} else {