托盘、货位增加老系统数据维护；

预约增加库存品数量维护

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="-tjj";
 
 
 	/**

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java

@@ -119,4 +119,16 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity {
 	@ApiModelProperty(value = "模板编号")
 	private String templateId;
 
+	/**
+	 * 旧库ID
+	 */
+	@ApiModelProperty(value = "旧库ID")
+	private Long oldId;
+
+	/**
+	 * 旧库位码
+	 */
+	@ApiModelProperty(value = "旧库位码")
+	private String oldQrCode;
+
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTrayEntity.java

@@ -89,4 +89,18 @@ public class BasicdataTrayEntity extends TenantEntity {
 	@ApiModelProperty(value = "类型;木托 铁托 台面托")
 	private Integer type;
 
+	/**
+	 * 托盘旧ID
+	 */
+	@ApiModelProperty(value = "托盘旧ID")
+	private Long oldId;
+
+
+	/**
+	 * 托盘旧托盘码
+	 */
+	@ApiModelProperty(value = "托盘旧托盘码")
+	private String oldQrCode;
+
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationEntity.java

@@ -141,6 +141,12 @@ public class DistributionReservationEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预约数量")
 	private Integer reservationNum;
+
+	/**
+	 * 预约数量
+	 */
+	@ApiModelProperty(value = "预约数量")
+	private Integer reservationStockListNum;
 	/**
 	 * 商场编号
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStocklistEntity.java

@@ -51,6 +51,18 @@ public class DistributionReservationStocklistEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预约数量")
 	private Integer reservationNum;
+
+	/**
+	 * 库存品单位
+	 */
+	@ApiModelProperty(value = "库存品单位")
+	private String unit;
+
+	/**
+	 * 是否为拆包产物
+	 */
+	@ApiModelProperty(value = "是否为拆包产物；1-否、2-是")
+	private Integer isUnpackProduct;
 	/**
 	 * 预留1
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml

@@ -12,6 +12,8 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="create_dept" property="createDept"/>
+        <result column="old_id" property="oldId"/>
+        <result column="old_qr_code" property="oldQrCode"/>
         <result column="id" property="id"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
@@ -85,6 +87,8 @@
             goods_allocation.layer_num,
             goods_allocation.qr_code,
             goods_allocation.qr_code_url,
+            goods_allocation.old_id,
+            goods_allocation.old_qr_code,
             goods_allocation.template_id,
             goods_shelf.goods_shelf_name AS goodsShelfName,
             goods_area.headline AS goodsAreaName

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -13,6 +13,8 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="create_dept" property="createDept"/>
         <result column="id" property="id"/>
+        <result column="old_id" property="oldId"/>
+        <result column="old_qr_code" property="oldQrCode"/>
         <result column="reserve1" property="reserve1"/>
         <result column="reserve2" property="reserve2"/>
         <result column="reserve3" property="reserve3"/>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionAddvalueController.java

@@ -52,7 +52,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("addvalue/distributionAddvalue")
+@RequestMapping("/distributionAddvalue")
 @Api(value = "增值服务表", tags = "增值服务表接口")
 public class DistributionAddvalueController extends BladeController {
 
@@ -147,4 +147,17 @@ public class DistributionAddvalueController extends BladeController {
 		ExcelUtil.export(response, "增值服务表数据" + DateUtil.time(), "增值服务表数据表", list, DistributionAddvalueExcel.class);
 	}
 
+
+	/**
+	 * 增值服务表 删除
+	 */
+	@GetMapping("/getStockAddValue")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R<?> getStockAddValue(@ApiParam(value = "主键集合", required = true) @RequestParam String id) {
+		R<?> result = distributionAddvalueService.getStockAddValue(id);
+		return R.data(result);
+	}
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -79,8 +79,6 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入distrbutionReservation")
 	public R<IPage<DistributionReservationEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, Query query) {
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query), Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class));
-
-
 		return R.data(pages);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java

@@ -22,6 +22,7 @@ import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -64,4 +65,11 @@ public interface DistributionAddvalueMapper extends BaseMapper<DistributionAddva
 	 * @return
 	 */
 	Integer deleteAddvalueByDelivery(@Param("id")String id);
+
+	/**
+	 * 查询订单增值服务
+	 * @param id
+	 * @return
+	 */
+    List<DistributionAddvalueEntity> getStockAddValue(String id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml

@@ -45,5 +45,35 @@
     <select id="exportDistributionAddvalue" resultType="com.logpm.distribution.excel.DistributionAddvalueExcel">
         SELECT * FROM logpm_distribution_addvalue ${ew.customSqlSegment}
     </select>
+    <select id="getStockAddValue" resultType="com.logpm.distribution.entity.DistributionAddvalueEntity">
+        SELECT
+            id,
+            tenant_id,
+            create_user,
+            create_time,
+            update_user,
+            update_time,
+            status,
+            is_deleted,
+            create_dept,
+            addvalue_id,
+            `number`,
+            floor,
+            people_num,
+            kilometer,
+            fee,
+            stock_article_id,
+            distance,
+            related_id,
+            reservation_id,
+            delivery_id
+        FROM
+            logpm_distribution_addvalue
+        <where>
+            <if test="id != '' and id != null">
+                and stock_article_id = #{id}
+            </if>
+        </where>
+    </select>
 
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -36,6 +36,7 @@
         <result column="reservation_num" property="reservationNum"/>
         <result column="reservation_code" property="reservationCode"/>
         <result column="period_of_time" property="periodOfTime"/>
+        <result column="reservation_stock_list_num" property="reservationStockListNum"/>
         <result column="fee" property="fee"/>
         <result column="cancel_reason" property="cancelReason"/>
         <result column="is_urgent" property="isUrgent"/>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java

@@ -22,6 +22,8 @@ import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
 import java.util.List;
 
 /**
@@ -49,4 +51,11 @@ public interface IDistributionAddvalueService extends BaseService<DistributionAd
 	 */
 	List<DistributionAddvalueExcel> exportDistributionAddvalue(Wrapper<DistributionAddvalueEntity> queryWrapper);
 
+	/**
+	 * 查询订单的增值服务项
+	 * @param id
+	 * @return
+	 */
+    R<?> getStockAddValue(String id);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java

@@ -21,6 +21,9 @@ import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.logpm.distribution.mapper.DistributionAddvalueMapper;
 import com.logpm.distribution.service.IDistributionAddvalueService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,8 +37,12 @@ import java.util.List;
  * @since 2023-06-15
  */
 @Service
+@AllArgsConstructor
 public class DistributionAddvalueServiceImpl extends BaseServiceImpl<DistributionAddvalueMapper, DistributionAddvalueEntity> implements IDistributionAddvalueService {
 
+	private  DistributionAddvalueMapper distributionAddvalueMapper;
+
+
 	@Override
 	public IPage<DistributionAddvalueVO> selectDistributionAddvaluePage(IPage<DistributionAddvalueVO> page, DistributionAddvalueVO distributionAddvalue) {
 		return page.setRecords(baseMapper.selectDistributionAddvaluePage(page, distributionAddvalue));
@@ -51,4 +58,19 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		return distributionAddvalueList;
 	}
 
+	@Override
+	public R<?> getStockAddValue(String id) {
+		if (Func.isBlank(id)){
+			log.error("参数异常id+{"+id+"}");
+			return R.fail("服务器正忙!!");
+		}
+		List<DistributionAddvalueEntity> addvalueEntityList = distributionAddvalueMapper.getStockAddValue(id);
+		if (Func.isEmpty(addvalueEntityList)){
+			log.error("订单查询增值服务失败");
+			return R.fail("该订单下无增值服务!!");
+		}else {
+			return R.data(addvalueEntityList);
+		}
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -187,7 +187,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		List<DistributionStockArticleEntity> stockArticleList = distributionReservationDTO.getStockArticleList();
 		List<DistributionStockListEntity> inventoryList = distributionReservationDTO.getInventoryList();
 		AtomicInteger stockArticleCount = new AtomicInteger();
-		AtomicInteger stockListCount = new AtomicInteger();
 		List<String> arrayList = new ArrayList<>();
 		//服务号拼接
 		HashSet serviceNumber = new HashSet();
@@ -217,7 +216,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							//维护订单下包件信息
 							distributionReservationPackageService.save(distributionReservationPackageEntity);
 							//此时订单下的所有包件都处于预约状态，可用数为0
-							packageNum.getAndIncrement();
+							packageNum.getAndAdd(p.getQuantity());
 						});
 					}
 					s.setAvailableQuantity(0);
@@ -229,7 +228,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageEntity.setParceListId(p.getId());
 						distributionReservationPackageEntity.setStockArticleId(s.getId());
 						distributionReservationPackageMapper.insert(distributionReservationPackageEntity);
-						packageNum.getAndIncrement();
+						packageNum.getAndAdd(p.getQuantity());
 					});
 					//设置订单可用数量为
 					s.setAvailableQuantity(s.getHandQuantity() - s.getReservationNum());
@@ -244,14 +243,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				arrayList.add(s.getOrderSelfNumbering());
 				//拼接服务号
 				serviceNumber.add(s.getServiceNumber());
-				//订单增值服务费
-				initTotal.accumulateAndGet(new BigDecimal(s.getFee().toString()), BigDecimal::add);
-				//订单协商费用
-				initTotal.accumulateAndGet(new BigDecimal(s.getRate().toString()), BigDecimal::add);
-				//订单到付费用
-				initTotal.accumulateAndGet(new BigDecimal(s.getCollectFee().toString()), BigDecimal::add);
-				//仓储费用
-				initTotal.accumulateAndGet(new BigDecimal(s.getStorageFee().toString()), BigDecimal::add);
+//				//订单增值服务费
+//				initTotal.accumulateAndGet(new BigDecimal(s.getFee().toString()), BigDecimal::add);
+//				//订单协商费用
+//				initTotal.accumulateAndGet(new BigDecimal(s.getRate().toString()), BigDecimal::add);
+//				//订单到付费用
+//				initTotal.accumulateAndGet(new BigDecimal(s.getCollectFee().toString()), BigDecimal::add);
+//				//仓储费用
+//				initTotal.accumulateAndGet(new BigDecimal(s.getStorageFee().toString()), BigDecimal::add);
 				Long stockArticleId = s.getId();
 				distributionReservationStockarticleEntity.setReservationId(reservationId);
 				distributionReservationStockarticleEntity.setStockArticleId(stockArticleId);
@@ -261,6 +260,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			});
 		}
 		//存在库存品构建预约库存品关联信息
+		AtomicInteger stockListCount = new AtomicInteger();
 		if (!Func.isEmpty(inventoryList)) {
 			inventoryList.forEach(i -> {
 				//如果库存品存在占用数量，这里就直接进行累加
@@ -273,6 +273,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionReservationStocklistEntity distributionReservationStocklistEntity = new DistributionReservationStocklistEntity();
 				distributionReservationStocklistEntity.setReservationId(reservationId);
 				distributionReservationStocklistEntity.setStocklistId(stocklistId);
+				distributionReservationStocklistEntity.setUnit(i.getUnit());
+				if (Func.isBlank(i.getPid().toString())){
+					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_NOT_HAVE_DATA);
+				}else {
+					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_HAVE_DATA);
+				}
 				distributionReservationStocklistEntity.setReservationNum(i.getReservationNum());
 				distributionReservationStocklistService.save(distributionReservationStocklistEntity);
 				stockListCount.getAndAdd(distributionReservationStocklistEntity.getReservationNum());
@@ -288,7 +294,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//统计数量
 		BigDecimal fee = initTotal.get().add(reservationEntity.getOtherFee());
 		reservationEntity.setFee(fee);
-		int count = stockArticleCount.get() + stockListCount.get();
 		String random = Func.random(13, RandomType.ALL);
 		reservationEntity.setReservationCode(random);
 		//设置预约为市配
@@ -296,7 +301,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//设置预约配送方式为送货
 		reservationEntity.setDeliveryWay(ServiceConstant.DELIVERY_GOODS_WAY);
 		reservationEntity.setServiceNumber(String.join(",", serviceNumber));
-		reservationEntity.setReservationNum(count);
+		reservationEntity.setReservationNum(stockArticleCount.get() );
+		reservationEntity.setReservationStockListNum(stockListCount.get() );
 		distributionReservationMapper.updateById(reservationEntity);
 		return true;
 	}
@@ -395,14 +401,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		String reservationIds = allocationDTO.getReservationIds();
 		//创建备货任务
 		DistributionStockupDTO stockup = allocationDTO.getStockup();
+		boolean flag = Func.isEmpty(stockup);
 		DistributionStockupEntity distributionStockupEntity = Func.copy(stockup, DistributionStockupEntity.class);
-		distributionStockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
-		distributionStockupEntity.setAssignTime(new Date());
-		distributionStockupEntity.setForkliftId(stockup.getForkliftId());
-		distributionStockupEntity.setStockupUser(AuthUtil.getUserId().toString());
-		distributionStockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
-		distributionStockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
-		distributionStockupService.save(distributionStockupEntity);
+		if (flag){
+			distributionStockupEntity.setAssignStatus(ServiceConstant.STOCkUP_ASSIGNSTATUS_ALREADY);
+			distributionStockupEntity.setAssignTime(new Date());
+			distributionStockupEntity.setForkliftId(stockup.getForkliftId());
+			distributionStockupEntity.setStockupUser(AuthUtil.getUserId().toString());
+			distributionStockupEntity.setStockupStatus(ServiceConstant.STOCkUP_STATE_NOT_EXECUTION);
+			distributionStockupEntity.setTypeService(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
+			distributionStockupService.save(distributionStockupEntity);
+		}
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
 		//设置车次号
 		String today = DateUtil.today();
@@ -434,26 +443,28 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			map.put("reservationId", i);
 			QueryWrapper<DistributionStockupInfoEntity> qw = Condition.getQueryWrapper(map, DistributionStockupInfoEntity.class);
 			DistributionStockupInfoEntity distributionStockupInfoEntity = distributionStockupInfoService.getOne(qw);
-			if (Func.isEmpty(distributionStockupInfoEntity)) {
-				//1、预约单不存在备货任务
-				//利用中间表建立起预约和备货表之间的关系
-				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
-				stockupInfoEntity.setReservationId(i);
-				stockupInfoEntity.setStockupId(stockupEntityId);
-				distributionStockupInfoService.save(stockupInfoEntity);
-			} else {
-				//TODO 这里还需要考虑一个备货任务下只有一条记录
-				//获取备货任务编号
-				Long stockupId = distributionStockupInfoEntity.getStockupId();
-				DistributionStockupEntity stockupEntity = distributionStockupService.getById(stockupId);
-				//2、预约单存在备货任务还未指派
-				if (Func.equals(stockupEntity.getAssignStatus(), ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE)) {
-					//对原有的备货关系进行修改
-					distributionStockupInfoEntity.setStockupId(stockupEntityId);
-					distributionStockupInfoService.updateById(distributionStockupInfoEntity);
+			if (flag){
+				if (Func.isEmpty(distributionStockupInfoEntity)) {
+					//1、预约单不存在备货任务
+					//利用中间表建立起预约和备货表之间的关系
+					DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
+					stockupInfoEntity.setReservationId(i);
+					stockupInfoEntity.setStockupId(stockupEntityId);
+					distributionStockupInfoService.save(stockupInfoEntity);
+				} else {
+					//TODO 这里还需要考虑一个备货任务下只有一条记录
+					//获取备货任务编号
+					Long stockupId = distributionStockupInfoEntity.getStockupId();
+					DistributionStockupEntity stockupEntity = distributionStockupService.getById(stockupId);
+					//2、预约单存在备货任务还未指派
+					if (Func.equals(stockupEntity.getAssignStatus(), ServiceConstant.STOCkUP_ASSIGNSTATUS_ABSENCE)) {
+						//对原有的备货关系进行修改
+						distributionStockupInfoEntity.setStockupId(stockupEntityId);
+						distributionStockupInfoService.updateById(distributionStockupInfoEntity);
+					}
+					//3、预约单存在备货任务且已指派备货
+					//不执行操作
 				}
-				//3、预约单存在备货任务且已指派备货
-				//不执行操作
 			}
 			DistributionReservationEntity reservationEntity = this.getById(i);
 			DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
@@ -468,9 +479,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			orderNum.getAndAdd(reservationEntity.getStockArticleId().split(",").length);
 			//统计包件数量
 			packageNum.getAndAdd(reservationEntity.getReservationNum());
-
 			//TODO 设置是否齐套
-
 			this.updateById(reservationEntity);
 			//订单自编号拼接
 			QueryWrapper<DistributionReservationStockarticleEntity> q = Condition.getQueryWrapper(new HashMap<String, Object>(), DistributionReservationStockarticleEntity.class);
@@ -491,38 +500,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					orderIds.append(stockArticleEntity.getId()).append(",");
 					//拼接订单自编号
 					hashSet.add(stockArticleEntity.getOrderSelfNumbering());
-					//判断订单是否存在有数据来源
-//					if (Func.equals(stockArticleEntity.getIsHaveData(),ServiceConstant.ORDER_HAVE_DATA)){
-//						//没有数据来源，维护订单和配送的关系
-//						// TODO 订单存在数据源，维护包件和配送之间的关系
-//						//根据中间表查询出预约单所选订单下的包件信息
-////						DistributionLoadscanEntity distributionLoadscanEntity = Func.copy(stockArticleEntity, DistributionLoadscanEntity.class);
-//						//每一个订单的维度进行插入
-//						reservationPackageEntityList.forEach(p->{
-//							//这里就应该将包件信息进行维护
-//							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(p.getParceListId());
-//							DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
-//							//满足订单的包件信息
-//							distributionLoadscanEntity.setDeliveryId(distributionDeliveryListEntity.getId());
-//							distributionLoadscanEntity.setReservationId(reservationEntity.getId());
-//							distributionLoadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
-//							distributionLoadscanEntity.setOrderId(stockArticleEntity.getId());
-//							if (Func.equals(p.getStockArticle(),stockArticleEntity.getId())){
-//								distributionLoadscanEntity.setPackageId(p.getParceListId());
-//								distributionLoadscanEntity.setPacketBarCode(parcelListEntity.getPacketBarCode());
-//							}
-//							distributionLoadscanService.save(distributionLoadscanEntity);
-//						});
-//					}else {
-//						//订单无数据来源
-//						DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
-//						distributionLoadscanEntity.setDeliveryId(distributionDeliveryListEntity.getId());
-//						distributionLoadscanEntity.setReservationId(reservationEntity.getId());
-//						distributionLoadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
-//						distributionLoadscanEntity.setOrderId(stockArticleEntity.getId());
-//						//按照订单的维度进行配送订单信息维护
-//						distributionLoadscanService.save(distributionLoadscanEntity);
-//					}
 					//存在数据来源，维护订单、包件和配送的关系
 					if (stockArticleEntity.getHandQuantity() > r.getReservationNum()) {
 						//这里表示订单下的包件没有进行全部配送
@@ -604,10 +581,14 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		}
 		//对配送信息进行修改
 		distributionDeliveryListEntity.setState(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
-		distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
-		distributionDeliveryListEntity.setForkliftName(stockup.getForkliftName());
-		distributionDeliveryListEntity.setForkliftId(stockup.getForkliftId().toString());
-		distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
+		if (flag){
+			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
+			distributionDeliveryListEntity.setForkliftName(stockup.getForkliftName());
+			distributionDeliveryListEntity.setForkliftId(stockup.getForkliftId().toString());
+			distributionDeliveryListEntity.setLoadingTeamId(stockup.getLoaderId());
+			distributionDeliveryListEntity.setLeadTime(allocationDTO.getStockup().getStockupDate());
+			distributionDeliveryListEntity.setLoadingTeamType(stockup.getLoadAndUnload());
+		}
 		distributionDeliveryListEntity.setCustomersNumber(reservationIds.split(",").length);
 		distributionDeliveryListEntity.setOrderNumber(orderNum.get());
 		distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
@@ -618,8 +599,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		distributionDeliveryListEntity.setReservationId(reservationIds);
 		distributionDeliveryListEntity.setDeliveryNumber(packageNum.get());
 		distributionDeliveryListEntity.setType(ServiceConstant.DELIVERY_TYPE_CUSTOMER);
-		distributionDeliveryListEntity.setLeadTime(allocationDTO.getStockup().getStockupDate());
-		distributionDeliveryListEntity.setLoadingTeamType(stockup.getLoadAndUnload());
+
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
 	}
@@ -699,8 +679,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			reservationStocklistEntityList.forEach(r1 -> {
 				Long stocklistId = r1.getStocklistId();
 				DistributionStockListEntity stockListEntity = distributionStockListService.getById(stocklistId);
-				stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - r1.getReservationNum());
-				stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() + r1.getReservationNum());
+				int num = stockListEntity.getQuantityOccupied() - r1.getReservationNum();
+				stockListEntity.setQuantityOccupied(num);
+//				stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() + r1.getReservationNum());
 				//这里对原表进行物理删除
 				distributionStockListService.updateById(stockListEntity);
 				distributionReservationStocklistMapper.deleteReservationStocklist(distributionReservationDTO.getId());
@@ -776,8 +757,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			});
 		}
 		List<DistributionStockListEntity> inventoryList = distributionReservationDTO.getInventoryList();
+		AtomicInteger stockListNum = new AtomicInteger();
 		if (!Func.isEmpty(inventoryList)) {
-			//重新构建备货信息
+			//重新构建预约和库存之间的关系
 			inventoryList.forEach(i -> {
 				DistributionStockListEntity stockListEntity = distributionStockListService.getById(i.getId());
 				int count = stockListEntity.getQuantityOccupied() + i.getReservationNum();
@@ -788,14 +770,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStocklistEntity.setReservationNum(i.getReservationNum());
 				distributionReservationStocklistEntity.setStocklistId(i.getId());
 				distributionReservationStocklistService.save(distributionReservationStocklistEntity);
-				packageCount.getAndAdd(i.getReservationNum());
 				hashSet.add(i.getOrderSelfNumbering());
+				stockListNum.getAndAdd(distributionReservationStocklistEntity.getReservationNum());
 			});
 		}
 		String orderId = String.join(",", hashSet);
 		distributionReservationEntity.setFee(initTotal.get());
 		distributionReservationEntity.setReservationNum(packageCount.get());
 		distributionReservationEntity.setStockArticleId(orderId);
+		distributionReservationEntity.setReservationStockListNum(stockListNum.get());
 		distributionReservationMapper.updateById(distributionReservationEntity);
 		return true;
 	}