1.修复包件打托上架数量计算不对的问题

2.同步数据没有更新计算订单状态和在库件数

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1373,6 +1373,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo, entity);
+			entity.setQuantity(1);
 			entity.setOrderPackageCode(vo.getPacketBarCode());
 			entity.setConditions(1);
 			entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
@@ -1445,6 +1446,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 					distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue());
 					distributionStockArticleEntity.setOrderStatus(OrderStatusConstant.bufenruku.getValue());
 				}
+				distributionStockArticleEntity.setHandQuantity(handQuantity + 1);
 				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 			}
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java

@@ -35,7 +35,7 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 		trayGoodsLogEntity.setBindingType(bindingType);
 		trayGoodsLogEntity.setRemark(remark);
 		trayGoodsLogEntity.setPalletizingType(palletizingType);
-		trayGoodsLogEntity.setNum(parcelListEntity.getQuantity());
+		trayGoodsLogEntity.setNum(1);
 		trayGoodsLogEntity.setWarehouseId(trayTypeEntity.getWarehouseId());
 		trayGoodsLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		save(trayGoodsLogEntity);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java

@@ -57,7 +57,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		trayGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		trayGoodsEntity.setAssociationType("3");
 		trayGoodsEntity.setGoodsName(parcelListEntity.getMaterialName());
-		trayGoodsEntity.setNum(parcelListEntity.getQuantity());
+		trayGoodsEntity.setNum(1);
 		trayGoodsEntity.setIsFleeing(isException);
 		trayGoodsEntity.setWarehouseId(trayTypeEntity.getWarehouseId());
 		save(trayGoodsEntity);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsLogServiceImpl.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.warehouse.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -27,7 +26,6 @@ import com.logpm.warehouse.entity.WarehouseUpdownTypeEntity;
 import com.logpm.warehouse.excel.WarehouseCustomizedExcel;
 import com.logpm.warehouse.excel.WarehouseStockedExcel;
 import com.logpm.warehouse.excel.WarehouseTemporaryExcel;
-import com.logpm.warehouse.excel.WarehouseUpdownGoodsLogExcel;
 import com.logpm.warehouse.mapper.WarehouseUpdownGoodsLogMapper;
 import com.logpm.warehouse.service.IWarehouseUpdownGoodsLogService;
 import com.logpm.warehouse.vo.WarehouseUpdownGoodsLogVO;
@@ -94,7 +92,7 @@ public class WarehouseUpdownGoodsLogServiceImpl extends BaseServiceImpl<Warehous
 		warehouseUpdownGoodsLogEntity.setAssociationId(parcelListEntity.getId());
 		warehouseUpdownGoodsLogEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		warehouseUpdownGoodsLogEntity.setAssociationType("3");
-		warehouseUpdownGoodsLogEntity.setNum(parcelListEntity.getQuantity());
+		warehouseUpdownGoodsLogEntity.setNum(1);
 		warehouseUpdownGoodsLogEntity.setRemark(remark);
 		warehouseUpdownGoodsLogEntity.setWarehouseId(updownTypeEntity.getWarehouseId());
 		save(warehouseUpdownGoodsLogEntity);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -114,7 +114,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		updownGoodsEntity.setAssociationId(parcelListEntity.getId());
 		updownGoodsEntity.setAssociationValue(parcelListEntity.getOrderPackageCode());
 		updownGoodsEntity.setAssociationType("3");//包件
-		updownGoodsEntity.setNum(parcelListEntity.getQuantity());
+		updownGoodsEntity.setNum(1);
 		updownGoodsEntity.setWarehouseId(updownTypeEntity.getWarehouseId());
 		save(updownGoodsEntity);
 		//存入包件货物上架记录