Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

service/stock_service.go

@@ -2739,6 +2739,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status= 1")
+
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
 	if startime > 0 {
@@ -2758,7 +2759,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 	if good_type > 0 {
 		db = db.Where("t.good_type_id = ?", good_type)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Group("x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Group("x.good_id").Scan(&info).Error
 	return info, total, err
 }
 

service/warhouse_service.go

@@ -650,6 +650,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				if goods_yc_temp.Count == goods_temp.Count {
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
 					goods = append(goods[:j], goods[j+1:]...)
+					break
 				}
 				fmt.Println("998888888888888", goods_yc_temp.Count)
 				fmt.Println("7777777777777777", goods_temp.Count)
@@ -657,7 +658,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 				if goods_yc_temp.Count > goods_temp.Count {
 					fmt.Println("进来了是吗")
 					temp_count := goods_yc_temp.Count - goods_temp.Count
-
 					goods_yc[i].Count = temp_count
 					goods = append(goods[:j], goods[j+1:]...)
 					break
@@ -671,6 +671,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 					goods[j].Count = temp_count
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
 					fmt.Println("888888888", goods_yc)
+					break
 				}
 			}
 		}
@@ -715,23 +716,31 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 		}
 
 		for _, item := range goods {
+			var newCount int64 = 0
 			for _, it := range goodOne {
 				if item.GoodTypeId == it.GoodTypeId && it.GoodId == it.GoodId {
-					it.NewCount = item.Count
+					newCount = it.Count
 				}
 			}
-		}
-
-		for _, item := range goodOne {
 			prepare := models.DialysisBeforePrepare{
 				GoodTypeId: item.GoodTypeId,
 				GoodId:     item.GoodId,
 				Count:      item.Count,
-				NewCount:   item.NewCount,
 			}
-			fmt.Println("数量99999999999999999", item.Count)
-			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, item.Count)
+
+			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 		}
+
+		// for _, item := range goodOne {
+		// 	prepare := models.DialysisBeforePrepare{
+		// 		GoodTypeId: item.GoodTypeId,
+		// 		GoodId:     item.GoodId,
+		// 		Count:      item.Count,
+		// 		NewCount:   item.NewCount,
+		// 	}
+		// 	fmt.Println("数量99999999999999999", item.Count)
+		// 	ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, item.Count)
+		// }
 	}
 
 	if len(goods_yc) > 0 {
@@ -785,7 +794,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			GoodId:                  goods.GoodId,
 			PatientId:               patient_id,
 		}
-		warehouseOutInfo.Count = goods.Count
+		warehouseOutInfo.Count = count
 		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 
@@ -840,7 +849,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				GoodId:                  goods.GoodId,
 				PatientId:               patient_id,
 			}
-			warehouseOutInfo.Count = goods.Count
+			warehouseOutInfo.Count = count
 			//更新入库详情表
 			UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
 			details := models.BloodAutomaticReduceDetail{
@@ -870,11 +879,9 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 		}
 		fmt.Println("newcount9999999999999999999999999999999", goods.NewCount)
-		if goods.NewCount == 0 {
-			maxNumber = count
-		} else {
-			maxNumber = goods.NewCount
-		}
+		
+		maxNumber = goods.Count
+		
 
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
@@ -896,112 +903,123 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		return nil
 	} else {
 		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
-		warehouseOutInfo := &models.WarehouseOutInfo{
-			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
-			WarehouseInfotId:        warehouse.ID,
-			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
-			OrgId:                   orgID,
-			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
-			IsSys:                   1,
-			SysRecordTime:           record_time,
-			GoodTypeId:              goods.GoodTypeId,
-			GoodId:                  goods.GoodId,
-			PatientId:               patient_id,
-		}
-		warehouseOutInfo.Count = stock_number
-		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
-		warehouseOutInfo.Price = stockInInfo.Price
-
-		_, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
-		if errcode == gorm.ErrRecordNotFound {
-			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-
-			if errOne != nil {
-				return errOne
-			} else {
-				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:                   orgID,
-					GoodId:                  goods.GoodId,
-					GoodTypeId:              goods.GoodTypeId,
-					Count:                   goods.Count,
-				}
-				errTwo := service.AddSigleAutoReduceRecordInfo(details)
-				if errTwo != nil {
-					return errTwo
-				}
-			}
-			// 出库完成后，要将该批次库存清零
-			warehouse.StockCount = 0
-			warehouse.Mtime = time.Now().Unix()
-			errThree := UpDateWarehouseInfoByStock(&warehouse)
-			if errThree != nil {
-				return errThree
-			}
-			// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-			goods.Count = deliver_number - stock_number
-
-			ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
-		} else if errcode == nil {
-
-			warehouseOutInfo := &models.WarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
-				WarehouseInfotId:        warehouse.ID,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Remark:                  "",
-				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            0,
-				Dealer:                  0,
-				IsSys:                   1,
-				SysRecordTime:           record_time,
-				GoodTypeId:              goods.GoodTypeId,
-				GoodId:                  goods.GoodId,
-				PatientId:               patient_id,
-			}
-			warehouseOutInfo.Count = goods.Count
-			//更新入库详情表
-			UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
-			details := models.BloodAutomaticReduceDetail{
-				WarehouseOutId:          warehouseOutInfo.ID,
-				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				PatientId:               patient_id,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   time.Now().Unix(),
-				Status:                  1,
-				RecordTime:              record_time,
-				OrgId:                   orgID,
-				GoodId:                  goods.GoodId,
-				GoodTypeId:              goods.GoodTypeId,
-				Count:                   count,
-			}
-			//查询当天耗材是否已经存在数据
-			_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-			if errcode == gorm.ErrRecordNotFound {
-				errTwo := CreateAutoReduceRecord(&details)
-				if errTwo != nil {
-					return errTwo
-				}
-			} else if errcode == nil {
-				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-
-				CreateAutoReduceRecord(&details)
-			}
+		// warehouseOutInfo := &models.WarehouseOutInfo{
+		// 	WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+		// 	WarehouseOutId:          warehouseOut.ID,
+		// 	WarehouseInfotId:        warehouse.ID,
+		// 	Status:                  1,
+		// 	Ctime:                   time.Now().Unix(),
+		// 	Remark:                  "",
+		// 	OrgId:                   orgID,
+		// 	Type:                    1,
+		// 	Manufacturer:            0,
+		// 	Dealer:                  0,
+		// 	IsSys:                   1,
+		// 	SysRecordTime:           record_time,
+		// 	GoodTypeId:              goods.GoodTypeId,
+		// 	GoodId:                  goods.GoodId,
+		// 	PatientId:               patient_id,
+		// }
+		// warehouseOutInfo.Count = stock_number
+		// stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
+		// warehouseOutInfo.Price = stockInInfo.Price
+
+		// cur_warehouse, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
+		// if errcode == gorm.ErrRecordNotFound {
+		// 	errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+
+		// 	if errOne != nil {
+		// 		return errOne
+		// 	} else {
+		// 		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:                   orgID,
+		// 			GoodId:                  goods.GoodId,
+		// 			GoodTypeId:              goods.GoodTypeId,
+		// 			Count:                   goods.Count,
+		// 		}
+		// 		errTwo := service.AddSigleAutoReduceRecordInfo(details)
+		// 		if errTwo != nil {
+		// 			return errTwo
+		// 		}
+		// 	}
+		// 	// 出库完成后，要将该批次库存清零
+		// 	warehouse.StockCount = 0
+		// 	warehouse.Mtime = time.Now().Unix()
+		// 	errThree := UpDateWarehouseInfoByStock(&warehouse)
+		// 	if errThree != nil {
+		// 		return errThree
+		// 	}
+		// 	// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		// 	goods.Count = deliver_number - stock_number
+
+		// 	ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
+		// } else if errcode == nil {
+
+		// 	warehouseOutInfo := &models.WarehouseOutInfo{
+		// 		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+		// 		WarehouseOutId:          warehouseOut.ID,
+		// 		WarehouseInfotId:        warehouse.ID,
+		// 		Status:                  1,
+		// 		Ctime:                   time.Now().Unix(),
+		// 		Remark:                  "",
+		// 		OrgId:                   orgID,
+		// 		Type:                    1,
+		// 		Manufacturer:            0,
+		// 		Dealer:                  0,
+		// 		IsSys:                   1,
+		// 		SysRecordTime:           record_time,
+		// 		GoodTypeId:              goods.GoodTypeId,
+		// 		GoodId:                  goods.GoodId,
+		// 		PatientId:               patient_id,
+		// 	}
+		// 	warehouseOutInfo.Count = cur_warehouse.Count + StockCount
+		// 	//更新入库详情表
+		// 	UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
+		// 	details := models.BloodAutomaticReduceDetail{
+		// 		WarehouseOutId:          warehouseOutInfo.ID,
+		// 		WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+		// 		PatientId:               patient_id,
+		// 		Ctime:                   time.Now().Unix(),
+		// 		Mtime:                   time.Now().Unix(),
+		// 		Status:                  1,
+		// 		RecordTime:              record_time,
+		// 		OrgId:                   orgID,
+		// 		GoodId:                  goods.GoodId,
+		// 		GoodTypeId:              goods.GoodTypeId,
+		// 		Count:                   count,
+		// 	}
+		// 	//查询当天耗材是否已经存在数据
+		// 	_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+		// 	if errcode == gorm.ErrRecordNotFound {
+		// 		errTwo := CreateAutoReduceRecord(&details)
+		// 		if errTwo != nil {
+		// 			return errTwo
+		// 		}
+		// 	} else if errcode == nil {
+		// 		DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+
+		// 		CreateAutoReduceRecord(&details)
+		// 	}
+		// }
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
 		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
 
+		ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
+		
 	}
 	return nil
 }
@@ -1041,10 +1059,10 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			GoodId:        good_yc.GoodId,
 			PatientId:     patient_id,
 		}
-		warehouseOutInfo.Count = delete_count
+		warehouseOutInfo.Count = ware.Count - delete_count
 		stockInInfo, _ := FindLastStockInInfoRecord(good_yc.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
-		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := UpdateAutoMaticReduceDetail(good_yc.GoodId, good_yc.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		} else {
@@ -1059,7 +1077,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 				OrgId:                   orgID,
 				GoodId:                  good_yc.GoodId,
 				GoodTypeId:              good_yc.GoodTypeId,
-				Count:                   delete_count,
+				Count:                   warehouseOutInfo.Count,
 				Type:                    2,
 			}
 			//查询是否当天已经存在数据