Merge branch 'fix-bug-20231206' into dev

# Conflicts:
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java

@@ -100,6 +100,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	 */
 	@ApiModelProperty(value = "托盘码")
 	private String trayCode;
+	/**
+	 * 托盘名称
+	 */
+	@ApiModelProperty(value = "托盘码")
+	private String trayName;
 
 	/**
 	 * 货物名称

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

@@ -1334,8 +1334,20 @@
     </select>
     <select id="getLoadingInventoryDetail" resultType="com.logpm.distribution.entity.DisStockListDetailEntity">
 
-        SELECT
-	        ldsld.*
+        SELECT DISTINCT
+	        ldsld.stock_list_id,
+	        ldsld.sku,
+	        ldsld.stock_package_code,
+	        ldsld.stock_type,
+	        ldsld.stock_locking_status,
+	        ldsld.stock_status,
+	        ldsld.stock_signfo_status,
+	        ldsld.warehouse_id,
+	        ldsld.warehouse_name,
+	        ldsld.num,
+	        ldsld.status,
+	        ldsld.reservation_id,
+	        ldsld.stock_package_status
         FROM
             logpm_distribution_signfor AS lds
             INNER JOIN logpm_distribution_reservation_stocklist AS ldrs ON lds.reservation_id = ldrs.reservation_id

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

@@ -306,8 +306,8 @@
         t.cargoUnit AS cargoUnit,
         ldslNew.tray_name AS trayName,
         ldslNew.unpack AS unpack,
-        (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id =#{reservationId}  AND lds.is_deleted = 0) AS realNum,
-        t.reservationNum as planNum,
+        (SELECT SUM(aldrs.reality_num) FROM logpm_distribution_reservation_stocklist AS aldrs WHERE aldrs.reservation_id = #{reservationId} AND aldrs.stocklist_id in (t.aaa)) AS realNum,
+        (SELECT SUM(newldrs.reservation_num) FROM logpm_distribution_reservation_stocklist AS newldrs WHERE newldrs.reservation_id = #{reservationId} AND newldrs.stocklist_id in (t.aaa)) AS planNum,
         (
         select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
         SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
@@ -320,7 +320,8 @@
         ldsl.id,
         ldrs.id as deliveryDetailsId,
         ldsl.cargo_unit as cargoUnit,
-        SUM(ldrs.reservation_num) AS reservationNum
+        ldrs.reservation_num AS reservationNum,
+        GROUP_CONCAT(ldsl.id) AS aaa
         FROM
         logpm_distribution_reservation_stocklist ldrs
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id

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

@@ -4999,6 +4999,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
+				String trayName = trayTypeDataVO.getTrayName();
+				c.setTrayName(trayName);
 				List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
 				if (Func.isNotEmpty(goodsLsit)) {
 					List<Long> longs = goodsLsit.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList());

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

@@ -489,7 +489,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				}
 				if(stockArticleEntity1.getTotalNumber().equals(list1.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);
+
 					//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
@@ -504,8 +505,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				);
 				if(!distributionParcelListEntities.isEmpty() && stockArticleEntity1.getTotalNumber().equals(distributionParcelListEntities.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
-						//修改
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);						//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
 					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
@@ -686,7 +686,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);
 		distributionStockListInfo.setWarehousingTime(distributionStockArticleEntity.getWarehouseEntryTime());
 		distributionStockListInfo.setStockArticleId(distributionStockArticleEntity.getId());
-		distributionStockListInfo.setParcelListId(distributionParcelList.getId());
 //		distributionStockListInfo.setLicensePlate(distributionStockArticleEntity.get); //车牌
 		distributionStockListInfo.setDespatch(distributionStockArticleEntity.getWaybillNumber()); //物流单号
 		distributionStockListInfoService.save(distributionStockListInfo);

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

@@ -1179,7 +1179,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 			//商，市
 			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
-
 			for (int i = 0; i < list.size(); i++) {
 				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
 				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java

@@ -39,7 +39,7 @@ public interface IFactoryOrderService extends BaseService<FactoryOrderEntity> {
 	IPage<FactoryOrderVO> selectFactoryOrderPage(IPage<FactoryOrderVO> page, FactoryOrderVO factoryOrder);
 
 
-    FactoryOrderEntity selectEntityBySelfCode(String selfCode);
+    FactoryOrderEntity selectEntityBySelfCode(String selfCode,Long receivingId);
 
 	/**
 	 * 根据包件查询订单

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java

@@ -40,10 +40,11 @@ public class FactoryOrderServiceImpl extends BaseServiceImpl<FactoryOrderMapper,
 	}
 
 	@Override
-	public FactoryOrderEntity selectEntityBySelfCode(String selfCode) {
+	public FactoryOrderEntity selectEntityBySelfCode(String selfCode,Long receivingId) {
 		QueryWrapper<FactoryOrderEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.select("self_code","id");
 		queryWrapper.eq("self_code",selfCode);
+		queryWrapper.eq("receiving_id",receivingId);
 		return baseMapper.selectOne(queryWrapper);
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -636,8 +636,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			analyzeData(resultArray);
 			opOrderStatusLogEntity.setDataStatus(1);
 		} catch (Exception e) {
-			e.printStackTrace();
-			log.error(">>>> TAG {} error {}", FactoryConstant.OUPAI, e.getMessage());
+			log.error(">>>> 欧派数据解析报错", e);
 			opOrderStatusLogEntity.setDataStatus(2);
 
 		}
@@ -739,7 +738,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 					}
 					String selfCode = orderEntity.getString("SelfCode");//订单自编码
 					//先查询是否存在订单自编码
-					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode);
+					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode,receivingId);
 
 					if (Objects.isNull(factoryOrderEntity)) {
 						factoryOrderEntity = new FactoryOrderEntity();
@@ -845,7 +844,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 						boolean save = factoryOrderService.save(factoryOrderEntity);
 						if (!save) {
-							log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
+							log.error("############handleData: 保存订单失败 selfCode={}", selfCode);
 							throw new CustomerException(403, "保存订单失败");
 						}
 					}