Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/TripartiteTransferApiController.java

@@ -39,8 +39,8 @@ public class TripartiteTransferApiController {
 		Integer type = loadCarsDTO.getType();
 		Integer pageNum = loadCarsDTO.getPageNum();
 		Integer pageSize = loadCarsDTO.getPageSize();
-		String startDate = loadCarsDTO.getStartDate();
-		String endDate = loadCarsDTO.getEndDate();
+		String createTimeStartStr = loadCarsDTO.getCreateTimeStartStr();
+		String createTimeEndStr = loadCarsDTO.getCreateTimeEndStr();
 		try{
 
 			//当前登录人选择的仓库
@@ -58,12 +58,12 @@ public class TripartiteTransferApiController {
 				loadCarsDTO.setPageSize(10);
 			}
 
-			if(StringUtil.isBlank(startDate)){
-				log.warn(method+"开始时间为空 startDate={}",startDate);
+			if(StringUtil.isBlank(createTimeStartStr)){
+				log.warn(method+"开始时间为空 createTimeStartStr={}",createTimeStartStr);
 				return R.fail(405,"开始时间为空");
 			}
-			if(StringUtil.isBlank(endDate)){
-				log.warn(method+"结束时间为空 endDate={}",endDate);
+			if(StringUtil.isBlank(createTimeEndStr)){
+				log.warn(method+"结束时间为空 createTimeEndStr={}",createTimeEndStr);
 				return R.fail(405,"结束时间为空");
 			}
 

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

@@ -519,6 +519,9 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				Long scanId = carsLoadScanEntity.getId();
 				Integer unloadNum = carsLoadScanEntity.getUnloadNum();
 				Integer num = carsLoadScanEntity.getNum();
+				String scanStatus = carsLoadScanEntity.getScanStatus();
+				Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
+
 				//卸车数量异常
 				AftersalesAbnormalRecordEntity abnormalRecordEntity = new AftersalesAbnormalRecordEntity();
 				abnormalRecordEntity.setTenantId(tenantId);
@@ -537,11 +540,19 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordEntity.setUpUserId(userId);
 				abnormalRecordEntity.setUpUserName(nickName);
 				abnormalRecordEntity.setAbnormalStatus(0);
+				abnormalRecordEntity.setRemark("零担卸车数量异常");
+				if("3".equals(scanStatus)){
+					abnormalRecordEntity.setAbnormalStatus(1);
+					abnormalRecordEntity.setRemark("零担签收未完成数量回退原仓");
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
+					if(!Objects.isNull(stockArticleEntity)){
+						distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(),num-unloadNum);
+					}
+				}
 				abnormalRecordEntity.setSendOrderStatus(0);
 				abnormalRecordEntity.setUpTime(new Date());
 				abnormalRecordEntity.setAssociationId(scanId);
 				abnormalRecordEntity.setAssociationType(1);
-				abnormalRecordEntity.setRemark("零担卸车数量异常");
 				abnormalRecordEntity.setIsZero(1);
 				abnormalRecordEntity.setNum(num-unloadNum);
 				addList.add(abnormalRecordEntity);

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

@@ -1166,7 +1166,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 											parcelNumberEntity.setStockArticleId(orderId);
 											parcelNumberEntity.setParcelListId(orderPackageId);
 											parcelNumberEntity.setQuantity(newParcelListEntity.getQuantity());
-											parcelNumberEntity.setHandQuantity(0);
+											parcelNumberEntity.setHandQuantity(newParcelListEntity.getQuantity());
 											parcelNumberEntity.setDeliveryQuantity(0);
 											parcelNumberEntity.setSigninQuantity(0);
 											parcelNumberEntity.setOutboundQuantity(0);

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

@@ -1,5 +1,6 @@
 package com.logpm.trunkline.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -170,6 +171,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 		BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId);
 		if(!Objects.isNull(warehouseEntity)){
 			//更新所有包件的当前所在仓
+			if(CollUtil.isNotEmpty(orderPackageCodes)){
 				List<TrunklineAdvanceDetailEntity> advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes);
 				advanceDetailEntities.forEach(advanceDetailEntity -> {
 					advanceDetailEntity.setNowWarehouseId(warehouseId);
@@ -177,6 +179,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 				});
 				advanceDetailService.updateBatchById(advanceDetailEntities);
 			}
+		}
 
 
 		Integer packageStatus = null;