耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3244,6 +3244,7 @@ func (this *DialysisAPIController) GetLastOrNextDoctorAdvice() {
 func (c *DialysisAPIController) CreateConsumables() {
 	record_date := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id", 0)
+	active, _ := c.GetInt64("active")
 	adminUser := c.GetMobileAdminUserInfo()
 
 	timeLayout := "2006-01-02"
@@ -3261,7 +3262,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 	var beforePrepares []*models.DialysisBeforePrepareGoods
 	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
-
+	var dialysisBefor []*models.DialysisBeforePrepare
 	if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 		goods, _ := dataBody["goods"].([]interface{})
 
@@ -3308,48 +3309,98 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 
 				newBeforePrepares = append(newBeforePrepares, newPrepareGoods)
-			}
 
+				prepare := &models.DialysisBeforePrepare{
+					GoodTypeId:   good_type_id,
+					GoodId:       good_id,
+					Count:        count,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					UserOrgId:    adminUser.Org.Id,
+					Status:       1,
+					Ctime:        time.Now().Unix(),
+					Creater:      adminUser.AdminUser.Id,
+					CommdityCode: commdity_code,
+				}
+
+				dialysisBefor = append(dialysisBefor, prepare)
+
+			}
 		}
-	}
-	fmt.Println("8888888888888888888888", beforePrepares)
-	if len(beforePrepares) > 0 {
 
-		//出库
-		err = service.ConsumablesDeliveryTotal(adminUser.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares)
-		fmt.Println("err", err)
+		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor)
+		//新增
+		if active == 1 && len(goods) > 0 {
+			for _, item := range dialysisBefor {
+				dialyPrepareOne := models.DialysisBeforePrepare{
+					GoodTypeId:   item.GoodTypeId,
+					GoodId:       item.GoodId,
+					PatientId:    item.PatientId,
+					RecordDate:   item.RecordDate,
+					UserOrgId:    item.UserOrgId,
+					Count:        item.Count,
+					Ctime:        time.Now().Unix(),
+					Creater:      item.Creater,
+					CommdityCode: item.CommdityCode,
+					Status:       1,
+				}
+				//先清除再插入
+				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+				err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
 
-		//查询今日出库数据
-		list, _ := service.GetAutoReduceRecordInfoByPatientId(adminUser.Org.Id, patient_id, record_time)
-		fmt.Println("1111111111111111111111111111111111111111111", list)
-		if len(list) == 0 {
-			return
+			}
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "保存成功",
+				})
+				return
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
 		}
 
-		//for _, item := range list {
-		//	prepare := models.DialysisBeforePrepare{
-		//		UserOrgId:  item.OrgId,
-		//		PatientId:  patient_id,
-		//		RecordDate: item.RecordTime,
-		//		GoodId:     item.GoodId,
-		//		GoodTypeId: item.GoodTypeId,
-		//		Count:      item.Count,
-		//		Ctime:      time.Now().Unix(),
-		//		Creater:    adminUser.AdminUser.Id,
-		//		Status:     1,
-		//	}
-		//  //删除准备表数据
-		//  service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time,item.GoodId,item.GoodTypeId)
-		//	service.CreateDialysisBeforePrepareOne(&prepare)
-		//}
+		if len(beforePrepares) > 0 && active == 2 {
+
+			//出库
+			err = service.ConsumablesDeliveryTotal(adminUser.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares)
+			fmt.Println("err", err)
+
+			//查询今日出库数据
+			list, _ := service.GetAutoReduceRecordInfoByPatientId(adminUser.Org.Id, patient_id, record_time)
+			fmt.Println("1111111111111111111111111111111111111111111", list)
+			if len(list) == 0 {
+				return
+			}
+
+			for _, item := range list {
+				prepare := models.DialysisBeforePrepare{
+					UserOrgId:  item.OrgId,
+					PatientId:  patient_id,
+					RecordDate: item.RecordTime,
+					GoodId:     item.GoodId,
+					GoodTypeId: item.GoodTypeId,
+					Count:      item.Count,
+					Ctime:      time.Now().Unix(),
+					Creater:    adminUser.AdminUser.Id,
+					Status:     1,
+				}
+				//删除准备表数据
+				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+				service.CreateDialysisBeforePrepareOne(&prepare)
+			}
 
+		}
 	}
+
 	var errs error
 
 	if dataBody["update_goods"] != nil && reflect.TypeOf(dataBody["update_goods"]).String() == "[]interface {}" {
-		goods, _ := dataBody["update_goods"].([]interface{})
-		if len(goods) > 0 {
-			for _, item := range goods {
+		update_goods, _ := dataBody["update_goods"].([]interface{})
+
+		if len(update_goods) > 0 {
+			for _, item := range update_goods {
 				items := item.(map[string]interface{})
 
 				if items["record_time"] == nil || reflect.TypeOf(items["record_time"]).String() != "float64" {
@@ -3401,7 +3452,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-
+				fmt.Println("count9999999999999923924343434343434343434", count)
 				if items["ctime"] == nil || reflect.TypeOf(items["ctime"]).String() != "float64" {
 					utils.ErrorLog("ctime")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3428,10 +3479,57 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 				newBeforePrepares = append(newBeforePrepares, newPrepareGoods)
 
+				prepare := &models.DialysisBeforePrepare{
+					GoodTypeId:   good_type_id,
+					GoodId:       good_id,
+					Count:        count,
+					PatientId:    patient_id,
+					RecordDate:   record_time,
+					UserOrgId:    adminUser.Org.Id,
+					Status:       1,
+					Ctime:        time.Now().Unix(),
+					Creater:      adminUser.AdminUser.Id,
+					CommdityCode: commdity_code,
+				}
+				dialysisBefor = append(dialysisBefor, prepare)
+
 			}
 		}
 
-		if len(beforePrepares) > 0 {
+		//新增
+		if active == 1 && len(update_goods) > 0 {
+			for _, item := range dialysisBefor {
+
+				dialyPrepareOne := models.DialysisBeforePrepare{
+					GoodTypeId:   item.GoodTypeId,
+					GoodId:       item.GoodId,
+					PatientId:    item.PatientId,
+					RecordDate:   item.RecordDate,
+					UserOrgId:    item.UserOrgId,
+					Count:        item.Count,
+					Ctime:        time.Now().Unix(),
+					Creater:      item.Creater,
+					CommdityCode: item.CommdityCode,
+					Status:       1,
+				}
+				//先清除再插入
+				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+				err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
+
+			}
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "保存成功",
+				})
+				return
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+		}
+
+		if len(beforePrepares) > 0 && active == 2 {
 			//出库
 			err = service.ConsumablesDeliveryTotal(adminUser.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares)
 			fmt.Println("err", err)
@@ -3457,14 +3555,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 				service.CreateDialysisBeforePrepareOne(&prepare)
 			}
 		}
-		//去重
-		//updateBeforePrepares = RemoveRepeatedGood(updateBeforePrepares)
 
-		//if len(updateBeforePrepares) > 0 {
-		//	for _, item := range updateBeforePrepares {
-		//		errs = service.UpdateDialysisBeforePrepareTwo(item)
-		//	}
-		//}
 	}
 	if errs == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3494,7 +3585,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 	record_time := theRecordTime.Unix()
 
 	consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
-
+	fmt.Println("000000000000000000000000000", consumables)
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
 	consumables = RemoveRepeatedGood(consumables)
@@ -3537,6 +3628,9 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				}
 
 				list, _ := service.GetAutoReduceRecordInfoByPatientId(adminInfo.Org.Id, patient_id, record_time)
+				if len(list) == 0 {
+					return
+				}
 				for _, item := range list {
 					prepare := models.DialysisBeforePrepare{
 						UserOrgId:  adminInfo.Org.Id,
@@ -3558,10 +3652,14 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 		} else if err == nil {
 			for _, item := range consumables {
 
+				fmt.Println("hhhhhhhhhh7777777777777", item.GoodId)
 				//出库
 				service.ConsumablesDelivery(item.UserOrgId, patient_id, record_time, item, &out, item.Count)
 
 				list, _ := service.GetAutoReduceRecordInfoByPatientId(adminInfo.Org.Id, patient_id, record_time)
+				if len(list) == 0 {
+					return
+				}
 				for _, item := range list {
 					prepare := models.DialysisBeforePrepare{
 						UserOrgId:  adminInfo.Org.Id,
@@ -3574,7 +3672,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 						Status:     1,
 						Ctime:      time.Now().Unix(),
 					}
-					fmt.Println("hhhhhhhhhhhhh666666666666666666666666666666")
+
 					//清空准备表数据
 					err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
@@ -3593,182 +3691,6 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 }
 
-//func (c *DialysisAPIController) CreateStockOutInfo() {
-//	patient_id, _ := c.GetInt64("patient_id", 0)
-//	record_date := c.GetString("record_time")
-//
-//	if patient_id <= 0 {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//
-//	adminInfo := c.GetMobileAdminUserInfo()
-//
-//	timeLayout := "2006-01-02"
-//	loc, _ := time.LoadLocation("Local")
-//	theRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
-//	record_time := theRecordTime.Unix()
-//
-//	consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
-//
-//	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
-//
-//	consumables = RemoveRepeatedGood(consumables)
-//
-//	if record.IsOpen == 1 {
-//		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-//		if err == gorm.ErrRecordNotFound {
-//			//没有记录，则创建出库单
-//			timeStr := time.Now().Format("2006-01-02")
-//			timeArr := strings.Split(timeStr, "-")
-//			total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
-//			total = total + 1
-//			warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-//			number = number + total
-//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-//			creater := adminInfo.AdminUser.Id
-//			warehouseOut := models.WarehouseOut{
-//				WarehouseOutOrderNumber: warehousing_out_order,
-//				OperationTime:           time.Now().Unix(),
-//				OrgId:                   adminInfo.Org.Id,
-//				Creater:                 creater,
-//				Ctime:                   time.Now().Unix(),
-//				Status:                  1,
-//				WarehouseOutTime:        record_time,
-//				Dealer:                  0,
-//				Manufacturer:            0,
-//				Type:                    1,
-//				IsSys:                   1,
-//			}
-//			err := service.AddSigleWarehouseOut(&warehouseOut)
-//			if err != nil {
-//				utils.TraceLog("创建出库单失败 err = %v", err)
-//			} else {
-//
-//				for _, item := range consumables {
-//
-//					if item.Count > 0 {
-//						warehouseOutInfo := &models.WarehouseOutInfo{
-//							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-//							WarehouseOutId:          warehouseOut.ID,
-//							Status:                  1,
-//							Ctime:                   time.Now().Unix(),
-//							Remark:                  "",
-//							OrgId:                   adminInfo.Org.Id,
-//							Type:                    1,
-//							Manufacturer:            0,
-//							Dealer:                  0,
-//							IsSys:                   1,
-//							SysRecordTime:           record_time,
-//							GoodTypeId:              item.GoodTypeId,
-//							GoodId:                  item.GoodId,
-//						}
-//						warehouseOutInfo.Count = item.Count
-//						stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
-//						warehouseOutInfo.Price = stockInInfo.Price
-//						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-//						if err == nil {
-//							details := &models.AutomaticReduceDetail{
-//								WarehouseOutId:          warehouseOutInfo.ID,
-//								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//								PatientId:               patient_id,
-//								Ctime:                   time.Now().Unix(),
-//								Mtime:                   time.Now().Unix(),
-//								Status:                  1,
-//								RecordTime:              record_time,
-//								OrgId:                   adminInfo.Org.Id,
-//								GoodId:                  item.GoodId,
-//								GoodTypeId:              item.GoodTypeId,
-//								Count:                   item.Count,
-//							}
-//							service.AddSigleAutoReduceRecordInfo(details)
-//						}
-//
-//					}
-//
-//				}
-//
-//			}
-//		} else if err == nil {
-//			for _, item := range consumables {
-//				outInfo, err := service.FindStockOutInfoByTypeId(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, out.ID, out.WarehouseOutOrderNumber)
-//				if err == gorm.ErrRecordNotFound {
-//					warehouseOutInfo := &models.WarehouseOutInfo{
-//						WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-//						WarehouseOutId:          out.ID,
-//						Status:                  1,
-//						Ctime:                   time.Now().Unix(),
-//						Remark:                  "",
-//						OrgId:                   adminInfo.Org.Id,
-//						Type:                    1,
-//						Manufacturer:            0,
-//						Dealer:                  0,
-//						IsSys:                   1,
-//						SysRecordTime:           record_time,
-//					}
-//
-//					stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
-//					warehouseOutInfo.Price = stockInInfo.Price
-//					warehouseOutInfo.GoodId = item.GoodId
-//					warehouseOutInfo.GoodTypeId = item.GoodTypeId
-//					warehouseOutInfo.Count = item.Count
-//					err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-//					if err == nil {
-//						details := &models.AutomaticReduceDetail{
-//							WarehouseOutId:          warehouseOutInfo.ID,
-//							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-//							PatientId:               patient_id,
-//							Ctime:                   time.Now().Unix(),
-//							Mtime:                   time.Now().Unix(),
-//							Status:                  1,
-//							RecordTime:              record_time,
-//							OrgId:                   adminInfo.Org.Id,
-//							GoodId:                  item.GoodId,
-//							GoodTypeId:              item.GoodTypeId,
-//							Count:                   item.Count,
-//						}
-//						service.AddSigleAutoReduceRecordInfo(details)
-//					}
-//
-//				} else if err == nil { //记录存在，则将增加数量
-//					if outInfo.ID > 0 {
-//						service.UpdateStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, item.Count)
-//					}
-//
-//					count, _ := service.FindPatientAutomaticReduceRecord(adminInfo.Org.Id, record_time, item.GoodId, item.GoodTypeId, patient_id)
-//					if count == 0 {
-//						details := &models.AutomaticReduceDetail{
-//							WarehouseOutId:          outInfo.ID,
-//							WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-//							PatientId:               patient_id,
-//							Ctime:                   time.Now().Unix(),
-//							Mtime:                   time.Now().Unix(),
-//							Status:                  1,
-//							RecordTime:              record_time,
-//							OrgId:                   adminInfo.Org.Id,
-//							GoodId:                  item.GoodId,
-//							GoodTypeId:              item.GoodTypeId,
-//							Count:                   item.Count,
-//						}
-//						service.AddSigleAutoReduceRecordInfo(details)
-//					} else if count == 1 {
-//						service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
-//					}
-//
-//				}
-//			}
-//		}
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"msg": "提交成功",
-//		})
-//		return
-//	} else {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOpenStocktWrong)
-//		return
-//	}
-//
-//}
 func (c *DialysisAPIController) EditConsumables() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	record_date := c.GetString("record_time")
@@ -4009,166 +3931,6 @@ func (c *DialysisAPIController) EditConsumables() {
 			return
 		}
 	}
-	//手动出库
-
-	//} else {
-	//	if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
-	//		goods, _ := dataBody["goods"].([]interface{})
-	//		if len(goods) > 0 {
-	//			for _, item := range goods {
-	//				items := item.(map[string]interface{})
-	//
-	//				if items["record_time"] == nil || reflect.TypeOf(items["record_time"]).String() != "float64" {
-	//					utils.ErrorLog("record_time")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				record_time := int64(items["record_time"].(float64))
-	//
-	//				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
-	//					utils.ErrorLog("id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				id := int64(items["id"].(float64))
-	//
-	//				if items["patient_id"] == nil || reflect.TypeOf(items["patient_id"]).String() != "float64" {
-	//					utils.ErrorLog("patient_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				patient_id := int64(items["patient_id"].(float64))
-	//
-	//				if items["creater"] == nil || reflect.TypeOf(items["creater"]).String() != "float64" {
-	//					utils.ErrorLog("creater")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				creater := int64(items["creater"].(float64))
-	//
-	//				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_id := int64(items["good_id"].(float64))
-	//
-	//				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_type_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_type_id := int64(items["good_type_id"].(float64))
-	//
-	//				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
-	//					utils.ErrorLog("count")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-	//         fmt.Println(count)
-	//				if items["ctime"] == nil || reflect.TypeOf(items["ctime"]).String() != "float64" {
-	//					utils.ErrorLog("ctime")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				ctime := int64(items["ctime"].(float64))
-	//				fmt.Println(ctime)
-	//				adminUser := c.GetMobileAdminUserInfo()
-	//				fmt.Println(adminUser)
-	//
-	//        prepareGoods := &models.DialysisBeforePrepareGoods{
-	//          GoodTypeId: good_type_id,
-	//          GoodId:     good_id,
-	//          Count:      count,
-	//        }
-	//
-	//        beforePrepares = append(beforePrepares, prepareGoods)
-	//				//prepare := &models.DialysisBeforePrepare{
-	//				//	ID:         id,
-	//				//	UserOrgId:  adminUser.Org.Id,
-	//				//	PatientId:  patient_id,
-	//				//	RecordDate: record_time,
-	//				//	GoodId:     good_id,
-	//				//	GoodTypeId: good_type_id,
-	//				//	Count:      count,
-	//				//	Ctime:      ctime,
-	//				//	Mtime:      time.Now().Unix(),
-	//				//	Creater:    creater,
-	//				//	Modifier:   adminUser.AdminUser.Id,
-	//				//	Status:     1,
-	//				//}
-	//				//beforePrepares = append(beforePrepares, prepare)
-	//
-	//			}
-	//		}
-	//	}
-	//	if dataBody["new_goods"] != nil && reflect.TypeOf(dataBody["new_goods"]).String() == "[]interface {}" {
-	//		goods, _ := dataBody["new_goods"].([]interface{})
-	//		if len(goods) > 0 {
-	//			for _, item := range goods {
-	//				items := item.(map[string]interface{})
-	//
-	//				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_id := int64(items["good_id"].(float64))
-	//
-	//				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_type_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_type_id := int64(items["good_type_id"].(float64))
-	//
-	//				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
-	//					utils.ErrorLog("count")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-	//
-	//				adminUser := c.GetMobileAdminUserInfo()
-	//				prepare := &models.DialysisBeforePrepare{
-	//					UserOrgId:  adminUser.Org.Id,
-	//					PatientId:  patient_id,
-	//					RecordDate: record_time,
-	//					GoodId:     good_id,
-	//					GoodTypeId: good_type_id,
-	//					Count:      count,
-	//					Ctime:      time.Now().Unix(),
-	//					Mtime:      time.Now().Unix(),
-	//					Creater:    adminUser.AdminUser.Id,
-	//					Modifier:   0,
-	//				}
-	//				newBeforePrepares = append(newBeforePrepares, prepare)
-	//
-	//			}
-	//		}
-	//		service.CreateDialysisBeforePrepare(newBeforePrepares)
-	//	}
-	//	var errs error
-	//	if len(beforePrepares) > 0 {
-	//		for _, item := range beforePrepares {
-	//			errs = service.UpdateDialysisBeforePrepareTwo(item)
-	//		}
-	//	}
-	//	if errs == nil {
-	//		c.ServeSuccessJSON(map[string]interface{}{
-	//			"msg": "修改成功",
-	//		})
-	//		return
-	//
-	//	} else {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-	//		return
-	//	}
-	//
-	//}
 
 }
 

controllers/stock_in_api_controller.go

@@ -196,19 +196,9 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				}
 
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					utils.ErrorLog("number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				number, _ := items["number"].(string)
 
-				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					remark = ""
-				} else {
-					remark = items["remark"].(string)
-				}
+				remark, _ := items["remark"].(string)
 
 				warehouseInfo := &models.WarehousingInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
@@ -579,19 +569,9 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				}
 
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					utils.ErrorLog("number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				number, _ := items["number"].(string)
 
-				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					remark = ""
-				} else {
-					remark = items["remark"].(string)
-				}
+				remark, _ := items["remark"].(string)
 
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")

service/stock_service.go

@@ -628,7 +628,7 @@ func FindAllDrugWarehousingList(orgId int64, page int64, limit int64, startTime
 }
 
 func FindWarehousingInfoById(id int64) (list []*models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? AND status = 1", id).Find(&list).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? AND status = 1", id).Preload("GoodInfo").Find(&list).Error
 	return list, err
 
 }

service/warhouse_service.go

@@ -756,10 +756,11 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
+
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
 	fmt.Println("库存数量", warehouse.StockCount)
 	if err != nil {
-		return err
+		return
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
@@ -869,7 +870,11 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 		}
 		fmt.Println("newcount9999999999999999999999999999999", goods.NewCount)
-		maxNumber = goods.NewCount
+		if goods.NewCount == 0 {
+			maxNumber = count
+		} else {
+			maxNumber = goods.NewCount
+		}
 
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")