|
|
|
|
@ -51,6 +51,7 @@ import com.logpm.warehouse.feign.IWarehouseWaybillDetailClient;
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.apache.commons.lang.StringEscapeUtils; |
|
|
|
|
import org.apache.commons.lang.StringUtils; |
|
|
|
|
import org.springblade.common.annotations.RepeatSubmit; |
|
|
|
|
import org.springblade.common.constant.*; |
|
|
|
|
import org.springblade.common.constant.carsload.CarsLoadLogTypeConstant; |
|
|
|
|
@ -368,6 +369,51 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
//查询零担发车件数
|
|
|
|
|
List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId); |
|
|
|
|
if(CollUtil.isNotEmpty(zeroNumVOList)){ |
|
|
|
|
zeroNumVOList.forEach(zeroNumVO -> { |
|
|
|
|
String waybillNo = zeroNumVO.getWaybillNo(); |
|
|
|
|
Integer num = zeroNumVO.getNum(); |
|
|
|
|
WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
Integer totalCount = waybill.getTotalCount(); |
|
|
|
|
Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus()); |
|
|
|
|
TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo); |
|
|
|
|
if(!Objects.isNull(waybillOrderEntity)){ |
|
|
|
|
Integer handleNumber = waybillOrderEntity.getHandleNumber(); |
|
|
|
|
if(Objects.isNull(handleNumber)){ |
|
|
|
|
handleNumber = 0; |
|
|
|
|
} |
|
|
|
|
int i = handleNumber + num; |
|
|
|
|
if(waybillStatusInt < 30){ |
|
|
|
|
if(totalCount == i){ |
|
|
|
|
waybill.setWaybillStatus("40"); |
|
|
|
|
waybillOrderEntity.setHandleNumber(i); |
|
|
|
|
warehouseWaybillClient.updateEntity(waybill); |
|
|
|
|
trunklineWaybillOrderService.updateById(waybillOrderEntity); |
|
|
|
|
}else{ |
|
|
|
|
waybill.setWaybillStatus("30"); |
|
|
|
|
waybillOrderEntity.setHandleNumber(i); |
|
|
|
|
warehouseWaybillClient.updateEntity(waybill); |
|
|
|
|
trunklineWaybillOrderService.updateById(waybillOrderEntity); |
|
|
|
|
} |
|
|
|
|
}else if(waybillStatusInt == 30){ |
|
|
|
|
if(totalCount == i){ |
|
|
|
|
waybill.setWaybillStatus("40"); |
|
|
|
|
waybillOrderEntity.setHandleNumber(i); |
|
|
|
|
warehouseWaybillClient.updateEntity(waybill); |
|
|
|
|
trunklineWaybillOrderService.updateById(waybillOrderEntity); |
|
|
|
|
}else{ |
|
|
|
|
waybillOrderEntity.setHandleNumber(i); |
|
|
|
|
trunklineWaybillOrderService.updateById(waybillOrderEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
|
trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
|
//删除没有装车的计划数据
|
|
|
|
|
@ -755,6 +801,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
//查询零担发车件数
|
|
|
|
|
List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId); |
|
|
|
|
if(CollUtil.isNotEmpty(zeroNumVOList)){ |
|
|
|
|
zeroNumVOList.forEach(zeroNumVO -> { |
|
|
|
|
String waybillNo = zeroNumVO.getWaybillNo(); |
|
|
|
|
Integer num = zeroNumVO.getNum(); |
|
|
|
|
WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
Integer totalCount = waybill.getTotalCount(); |
|
|
|
|
Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus()); |
|
|
|
|
TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo); |
|
|
|
|
if(!Objects.isNull(waybillOrderEntity)){ |
|
|
|
|
Integer handleNumber = waybillOrderEntity.getHandleNumber(); |
|
|
|
|
if(waybillStatusInt == 40 || waybillStatusInt == 30){ |
|
|
|
|
if(Objects.isNull(handleNumber)){ |
|
|
|
|
handleNumber = 0; |
|
|
|
|
} |
|
|
|
|
int i = handleNumber - num; |
|
|
|
|
if(i==0){ |
|
|
|
|
waybill.setWaybillStatus("20"); |
|
|
|
|
waybillOrderEntity.setHandleNumber(totalCount); |
|
|
|
|
}else{ |
|
|
|
|
waybill.setWaybillStatus("30"); |
|
|
|
|
waybillOrderEntity.setHandleNumber(i); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
warehouseWaybillClient.updateEntity(waybill); |
|
|
|
|
trunklineWaybillOrderService.updateById(waybillOrderEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
|
trunklineCarsOrderService.updateStartNumToPlanNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
|
|
|
|
|
|
@ -1003,6 +1084,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
|
|
|
|
|
String carsNo = carsLoadEntity.getCarsNo(); |
|
|
|
|
|
|
|
|
|
if (!warehouseId.equals(nowWarehouseId)) { |
|
|
|
|
log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId); |
|
|
|
|
@ -1182,30 +1264,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelNumberClient.addBatch(ls); |
|
|
|
|
|
|
|
|
|
if(isTransfer == 0){ |
|
|
|
|
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>(); |
|
|
|
|
queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber()) |
|
|
|
|
.eq("order_code",stockArticleEntity.getWaybillNumber()); |
|
|
|
|
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1); |
|
|
|
|
if(!Objects.isNull(one)){ |
|
|
|
|
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(stockArticleEntity.getWaybillNumber()); |
|
|
|
|
Integer totalCount = waybillEntity.getTotalCount(); |
|
|
|
|
Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus()); |
|
|
|
|
if(waybillStatusInt <= 30){ |
|
|
|
|
Integer handleNumber = one.getHandleNumber(); |
|
|
|
|
int total = handleNumber + unloadNum; |
|
|
|
|
if(total < totalCount){ |
|
|
|
|
waybillEntity.setWaybillStatus("50"); |
|
|
|
|
one.setHandleNumber(total); |
|
|
|
|
}else{ |
|
|
|
|
waybillEntity.setWaybillStatus("60"); |
|
|
|
|
one.setHandleNumber(totalCount); |
|
|
|
|
} |
|
|
|
|
warehouseWaybillClient.updateEntity(waybillEntity); |
|
|
|
|
trunklineWaybillOrderService.updateById(one); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// if(isTransfer == 0){
|
|
|
|
|
// //查询零担发车件数
|
|
|
|
|
// List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId);
|
|
|
|
|
// if(CollUtil.isNotEmpty(zeroNumVOList)){
|
|
|
|
|
// zeroNumVOList.forEach(zeroNumVO -> {
|
|
|
|
|
// String waybillNo = zeroNumVO.getWaybillNo();
|
|
|
|
|
// Integer num = zeroNumVO.getNum();
|
|
|
|
|
// WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
|
|
|
|
|
// Integer totalCount = waybill.getTotalCount();
|
|
|
|
|
// Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus());
|
|
|
|
|
// TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo);
|
|
|
|
|
// if(!Objects.isNull(waybillOrderEntity)){
|
|
|
|
|
// Integer handleNumber = waybillOrderEntity.getHandleNumber();
|
|
|
|
|
// if(waybillStatusInt <= 40){
|
|
|
|
|
// if(Objects.isNull(handleNumber)){
|
|
|
|
|
// handleNumber = 0;
|
|
|
|
|
// }
|
|
|
|
|
// int i = handleNumber - num;
|
|
|
|
|
// if(i==0){
|
|
|
|
|
// waybill.setWaybillStatus("20");
|
|
|
|
|
// waybillOrderEntity.setHandleNumber(totalCount);
|
|
|
|
|
// }else{
|
|
|
|
|
// waybill.setWaybillStatus("30");
|
|
|
|
|
// waybillOrderEntity.setHandleNumber(i);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// warehouseWaybillClient.updateEntity(waybill);
|
|
|
|
|
// trunklineWaybillOrderService.updateById(waybillOrderEntity);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
Integer hQuantity = newStockArticleEntity.getHandQuantity() + unloadNum; |
|
|
|
|
@ -1231,39 +1324,78 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
newStockArticleEntity.setIncomingNum(incomingNum); |
|
|
|
|
|
|
|
|
|
distributionStockArticleClient.saveOrUpdate(newStockArticleEntity); |
|
|
|
|
String waybillNumber = newStockArticleEntity.getWaybillNumber(); |
|
|
|
|
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber); |
|
|
|
|
// String waybillNumber = newStockArticleEntity.getWaybillNumber();
|
|
|
|
|
// WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
|
|
|
|
|
// Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();
|
|
|
|
|
// if(warehouseId.equals(destinationWarehouseId)){
|
|
|
|
|
// QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
|
// queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber())
|
|
|
|
|
// .eq("order_code",stockArticleEntity.getWaybillNumber());
|
|
|
|
|
// TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
|
|
|
|
|
// if(!Objects.isNull(one)){
|
|
|
|
|
// Integer totalCount = warehouseWaybillEntity.getTotalCount();
|
|
|
|
|
// Integer waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus());
|
|
|
|
|
// if(waybillStatusInt <= 30){
|
|
|
|
|
// Integer handleNumber = one.getHandleNumber();
|
|
|
|
|
// int total = handleNumber + unloadNum;
|
|
|
|
|
// if(total < totalCount){
|
|
|
|
|
// warehouseWaybillEntity.setWaybillStatus("50");
|
|
|
|
|
// one.setHandleNumber(total);
|
|
|
|
|
// }else{
|
|
|
|
|
// warehouseWaybillEntity.setWaybillStatus("60");
|
|
|
|
|
// one.setHandleNumber(totalCount);
|
|
|
|
|
// }
|
|
|
|
|
// warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
|
|
|
|
|
// trunklineWaybillOrderService.updateById(one);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(orderCode); |
|
|
|
|
String waybillNo = warehouseWaybillEntity.getWaybillNo(); |
|
|
|
|
Long waybillId = warehouseWaybillEntity.getId(); |
|
|
|
|
int unloadNum = orderCodeList.stream().mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum(); |
|
|
|
|
Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId(); |
|
|
|
|
if(warehouseId.equals(destinationWarehouseId)){ |
|
|
|
|
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>(); |
|
|
|
|
queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber()) |
|
|
|
|
.eq("order_code",stockArticleEntity.getWaybillNumber()); |
|
|
|
|
queryWrapper1.eq("waybill_no",orderCode) |
|
|
|
|
.eq("order_code",orderCode); |
|
|
|
|
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1); |
|
|
|
|
if(!Objects.isNull(one)){ |
|
|
|
|
Integer handleNumber = one.getHandleNumber(); |
|
|
|
|
Integer totalCount = warehouseWaybillEntity.getTotalCount(); |
|
|
|
|
Integer waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus()); |
|
|
|
|
if(waybillStatusInt <= 30){ |
|
|
|
|
Integer handleNumber = one.getHandleNumber(); |
|
|
|
|
int total = handleNumber + unloadNum; |
|
|
|
|
if(total < totalCount){ |
|
|
|
|
if(waybillStatusInt < 50){ |
|
|
|
|
if(total != totalCount){ |
|
|
|
|
warehouseWaybillEntity.setWaybillStatus("50"); |
|
|
|
|
one.setHandleNumber(total); |
|
|
|
|
warehouseWaybillClient.updateEntity(warehouseWaybillEntity); |
|
|
|
|
trunklineWaybillOrderService.updateById(one); |
|
|
|
|
}else{ |
|
|
|
|
warehouseWaybillEntity.setWaybillStatus("60"); |
|
|
|
|
one.setHandleNumber(totalCount); |
|
|
|
|
} |
|
|
|
|
one.setHandleNumber(total); |
|
|
|
|
warehouseWaybillClient.updateEntity(warehouseWaybillEntity); |
|
|
|
|
trunklineWaybillOrderService.updateById(one); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}else if(waybillStatusInt == 50){ |
|
|
|
|
if(total == totalCount){ |
|
|
|
|
warehouseWaybillEntity.setWaybillStatus("60"); |
|
|
|
|
one.setHandleNumber(total); |
|
|
|
|
warehouseWaybillClient.updateEntity(warehouseWaybillEntity); |
|
|
|
|
trunklineWaybillOrderService.updateById(one); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//无装车记录异常日志记录
|
|
|
|
|
@ -2649,9 +2781,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
|
|
|
|
|
remark = "有数据,不在当前仓,异常装车"; |
|
|
|
|
audio = "包件未入库"; |
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, fromWarehouseId, "干线装车下架解托"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
String orderPackageStatus = parcelListEntity.getOrderPackageStatus(); |
|
|
|
|
@ -2735,7 +2870,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelListClient.updateOrderPackageCodeById(packageId, "60"); |
|
|
|
|
distributionStockArticleClient.submitHandleNumByOrderId(1, articleId); |
|
|
|
|
if (StringUtil.isBlank(trayCode)) { |
|
|
|
|
if (StringUtil.isBlank(trayCode) && StringUtil.isBlank(orderPackageCode)) { |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, warehouseId, "干线装车下架解托"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -6663,7 +6798,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity(); |
|
|
|
|
updateStockArticle.setId(distributionStockArticle.getId()); |
|
|
|
|
updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num); |
|
|
|
|
@ -6687,6 +6821,34 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
updateStockArticle.setId(distributionStockArticle.getId()); |
|
|
|
|
updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num); |
|
|
|
|
updateStockArticleList.add(updateStockArticle); |
|
|
|
|
|
|
|
|
|
if(warehouseId.equals(fromWarehouseId)){ |
|
|
|
|
Long waybillId = distributionStockArticle.getWaybillId(); |
|
|
|
|
String waybillNo = distributionStockArticle.getWaybillNumber(); |
|
|
|
|
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); |
|
|
|
|
|
|
|
|
|
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>(); |
|
|
|
|
queryWrapper1.eq("waybill_id",waybillId) |
|
|
|
|
.eq("order_code",waybillNo); |
|
|
|
|
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1); |
|
|
|
|
if(!Objects.isNull(one)){ |
|
|
|
|
Integer totalCount = waybillEntity.getTotalCount(); |
|
|
|
|
Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus()); |
|
|
|
|
if(waybillStatusInt <= 40){ |
|
|
|
|
Integer handleNumber = one.getHandleNumber(); |
|
|
|
|
int total = handleNumber - num; |
|
|
|
|
if(total == 0){ |
|
|
|
|
waybillEntity.setWaybillStatus("20"); |
|
|
|
|
one.setHandleNumber(total); |
|
|
|
|
}else{ |
|
|
|
|
waybillEntity.setWaybillStatus("30"); |
|
|
|
|
one.setHandleNumber(totalCount); |
|
|
|
|
} |
|
|
|
|
warehouseWaybillClient.updateEntity(waybillEntity); |
|
|
|
|
trunklineWaybillOrderService.updateById(one); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
@ -7279,8 +7441,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelListClient.update(distributionParcelListEntity); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, nowWarehouseId, "干线卸车下架解托"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
//需要补装车扫记录
|
|
|
|
|
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity(); |
|
|
|
|
@ -7454,13 +7618,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelListClient.update(distributionParcelListEntity); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, wid, "干线卸车下架解托"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//无装车记录异常日志记录
|
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
carsLoadAsyncService.abnormalListUnloadByLoadIdAndWarehouseId(loadId, warehouseId, warehouseName, loadScanId, AuthUtil.getTenantId(), AuthUtil.getUserId(), AuthUtil.getNickName(), Func.firstLong(AuthUtil.getDeptId())); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.warn("###############unloadPackage: 存入异常列表记录失败"); |
|
|
|
|
@ -7970,8 +8134,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelListClient.update(distributionParcelListEntity); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, nowWarehouseId, "干线卸车下架解托"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
//需要补装车扫记录
|
|
|
|
|
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = new TrunklineCarsLoadScanEntity(); |
|
|
|
|
@ -8134,9 +8300,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
} |
|
|
|
|
distributionParcelListClient.update(distributionParcelListEntity); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, wid, "干线卸车下架解托"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//无装车记录异常日志记录
|
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
@ -8181,8 +8353,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
|
|
|
|
|
trayName = trayEntity.getPalletName(); |
|
|
|
|
} |
|
|
|
|
if (unbindTray == 1) { |
|
|
|
|
if(StringUtils.isNotBlank(orderPackageCode)){ |
|
|
|
|
updownTypeClient.downPackageOrDelTray(orderPackageCode, fromWarehouseId, "干线卸车下架解托"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
trunklineCarsLoadScanService.updateById(carsLoadScanEntity); |
|
|
|
|
|
|
|
|
|
trunklineCarsUnloadLogService.savaUnloadLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1, |
|
|
|
|
|
zhenghaoyu
8 months ago