Merge branch 'dev' into pre-production

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

@@ -740,7 +740,6 @@
         ldsa.service_number, ldsa.order_code,
         ldsa.mall_id, ldsa.mall_code, ldsa.mall_name, ldsa.store_name,
         ldsa.store_code, ldsa.store_id, ldsa.description_goods, ldsa.warehouse_id,
-        <!--        &#45;&#45; ldsa.hand_quantity,-->
         ldsa.warehouse, ldsa.warehouse_entry_time, ldsa.store_time, ldsa.total_number,
         ldsa.complete_set, ldsa.brand, ldsa.type_service, ldsa.customer_name, ldsa.customer_telephone,
         ldsa.customer_address, ldsa.genre,
@@ -768,7 +767,7 @@
             FROM logpm_distribution_parcel_list ldpll
             WHERE
             ldsa.id = ldpll.stock_article_id
-
+            AND ldpll.is_transfer = 0
             AND ldpll.order_package_loading_status != '20'
             AND ldpll.order_package_reservation_status != '20'
             AND ldpll.order_package_status != '70'

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

@@ -1518,7 +1518,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					packageData.setPackageType(type);
 				packageDataList.add(packageData);
 			}
-
 		}
 		nodeFanoutMsg.setDetails(packageDataList);
 		rabbitTemplate.convertAndSend(FanoutConstants.distribution.plan.EXCHANGE, null, JSONObject.toJSONString(nodeFanoutMsg));

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -226,7 +226,7 @@ public class InComingServiceImpl implements IInComingService {
 			List<TrunklineAdvanceDetailEntity> advanceDetailEntityList = advanceDetailService.list(advanceDetailQueryWrapper);
 			if (advanceDetailEntityList.isEmpty()) {
 				log.warn("############incomingPackage: 包件不存在 packageCodes={} warehouseId={}", packageCodes, warehouseId);
-				return Resp.scanFail(405, "包件无数据", "包件无数据");
+				return Resp.scanFail(405, "系统无编码", "系统无编码");
 			}
 
 			if(incomingType == 1 || incomingType == 2){

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -2206,13 +2206,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		warehouseWaybillClient.updateEntity(waybillEntity);
 
-		advanceDetailService.updateBatchById(updateAdvanceDetailList);
+		if(CollUtil.isNotEmpty(updateAdvanceDetailList)){
+			advanceDetailService.updateBatchById(updateAdvanceDetailList);
+		}
 
 //		String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg;
 		//异步存入日志
 		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
 
-		List<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
+//		List<WarehouseWayBillDetail> wayBillDetailList = warehouseWaybillDetailClient.findListByWaybillNo(waybillNo);
 
 		Integer waybillType = waybillEntity.getWaybillType();
 		Long consigneeId = waybillEntity.getConsigneeId();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -5789,7 +5789,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderCode = e.getOrderCode();
 			String waybillNo = e.getWaybillNo();
 			Integer planNum = e.getPlanNum();
-			if (realNum.equals(0)) {
+			if (realNum < planNum) {
 				loadingZero(loadId, warehouseId, waybillNo, orderCode, null, planNum, "手动一键装车");
 			}
 		});