From dc1899d11b269962f08b85b8b02e4918a0c2e5a6 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 16:05:04 +0800
Subject: [PATCH 1/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A0=E7=BC=96=E7=A0=81=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 41822a3ee..b4680d4a8 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -13398,6 +13398,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
trunklineAdvanceDetailService.updateBatchById(updateNowWarehouseList);
}
+ if(CollUtil.isNotEmpty(updateScanList)){
+ trunklineCarsLoadScanService.updateBatchById(updateScanList);
+ }
From eb4089e77115b7c0dfd2eba91f9257581d2b14f2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 24 Mar 2025 16:18:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E7=AD=BE?=
=?UTF-8?q?=E6=94=B6=E7=8E=87=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1 修改签收状态字段显示错误问题
---
.../com/logpm/report/mapper/QualityDispatchNumberMapper.xml | 2 +-
.../logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
index a1db885e3..542ea77f3 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml
@@ -143,7 +143,7 @@
t.driver_name,
t.vehicle_name,
t.delivery_create_user_name,
- case when t.sign_status = 1 then '已签收' else '未签收' end signStatus,
+ t.sign_status signStatus,
t.sign_time,
t.sign_user_name,
t.reviewStatus,
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java
index 7a896959c..602e319b1 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/qulity/dispatch/QualityDispatchTaskVO.java
@@ -1,5 +1,6 @@
package com.logpm.report.vo.qulity.dispatch;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -94,7 +95,7 @@ public class QualityDispatchTaskVO implements Serializable {
private Integer signStockNum;
@ApiModelProperty(value = "状态")
- @ExcelProperty("状态")
+ @ExcelIgnore
private String signStatus;
@ApiModelProperty(value = "签收时间")
From 6c266cf99a6911d99f7b0756a861d3bd1252e8e5 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 16:31:36 +0800
Subject: [PATCH 3/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A0=E7=BC=96=E7=A0=81=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/TrunklineCarsLoadServiceImpl.java | 32 +++++++++++++++++--
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index b4680d4a8..d3a88353d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -13297,6 +13297,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
allAdvanceDetailList.addAll(advanceDetailEntityList);
});
+ //把allAdvanceDetailList中所有advanceId放入一个Set集合
+ Set<Long> advanceIdSet = allAdvanceDetailList.stream().map(TrunklineAdvanceDetailEntity::getAdvanceId).collect(Collectors.toSet());
+ List<TrunklineAdvanceEntity> advanceEntities = advanceService.findListByIds(new ArrayList<>(advanceIdSet));
+ //把advanceEntities转化成id为key的Map
+ Map<Long, TrunklineAdvanceEntity> advanceMap = advanceEntities.stream().collect(Collectors.toMap(TrunklineAdvanceEntity::getId, Function.identity()));
+
+
//把allAdvanceDetailList转化成orderPackageCode为key的Map
Map<String, TrunklineAdvanceDetailEntity> advanceDetailMap = allAdvanceDetailList.stream().collect(Collectors.toMap(TrunklineAdvanceDetailEntity::getOrderPackageCode, Function.identity()));
@@ -13310,6 +13317,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
Date unloadTime = carsLoadScanEntity.getUnloadTime();
TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = advanceDetailMap.get(orderPackageCode);
if(!Objects.isNull(trunklineAdvanceDetailEntity)){
+ Long advanceId = trunklineAdvanceDetailEntity.getAdvanceId();
+
orderPackageCodeSet.add(orderPackageCode);
TrunklineCarsLoadScanEntity updateScanEntity = new TrunklineCarsLoadScanEntity();
updateScanEntity.setId(carsLoadScanEntity.getId());
@@ -13327,6 +13336,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
updateScanEntity.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode());
updateScanEntity.setWaybillId(trunklineAdvanceDetailEntity.getWaybillId());
updateScanEntity.setWaybillNo(trunklineAdvanceDetailEntity.getWaybillNo());
+ TrunklineAdvanceEntity advanceEntity = advanceMap.get(advanceId);
+ if(!Objects.isNull(advanceEntity)){
+ updateScanEntity.setCustomerName(advanceEntity.getCustomerName());
+ updateScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+ updateScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+ }
+ updateScanEntity.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName());
+ updateScanEntity.setSenconds(trunklineAdvanceDetailEntity.getSecondPackName());
+ updateScanEntity.setThirds(trunklineAdvanceDetailEntity.getThirdPackName());
+ updateScanEntity.setMaterialCode(trunklineAdvanceDetailEntity.getMaterialCode());
+ updateScanEntity.setMaterialName(trunklineAdvanceDetailEntity.getMaterialName());
updateScanEntity.setIsData(1);
updateScanList.add(updateScanEntity);
}
@@ -13426,9 +13446,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
- udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
-
- });
+// udateAdvanceDetailList.forEach(trunklineAdvanceDetailEntity -> {
+//
+// });
}
@@ -13447,6 +13467,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
dealWithAbnormalVO.setNickName(AuthUtil.getNickName());
dealWithAbnormalVO.setRemark("数据同步系统自动处理（"+warehouseName+" "+carsLoadEntity.getCarsNo()+" "+AuthUtil.getNickName()+"）");
abnormalRecordClient.dealwithOrderPackageCodes(dealWithAbnormalVO);
+
+ List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
+
+ String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode());
+ packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);
+
}
bladeRedis.del(key);
From 09964ca74bcf33ba63a78fc35d26ab16cc7b3572 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 17:11:49 +0800
Subject: [PATCH 4/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A0=E7=BC=96=E7=A0=81=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index d3a88353d..ae10cae5a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -13310,6 +13310,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<TrunklineCarsLoadScanEntity> updateScanList = new ArrayList<>();
List<TrunklineAdvanceDetailEntity> incomingAdvanceDetailList = new ArrayList<>();
List<TrunklineAdvanceDetailEntity> udateAdvanceDetailList = new ArrayList<>();
+ List<String> orderPackageCodeList = new ArrayList<>();
Set<String> orderPackageCodeSet = new HashSet<>();
carsLoadScanEntities.forEach(carsLoadScanEntity -> {
@@ -13378,6 +13379,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String reserve5 = trunklineAdvanceDetailEntity.getReserve5();
Date unloadTime = CommonUtil.StringToDate(reserve5);
+ orderPackageCodeList.add(orderPackageCode);
+
//查询是否有在系统无编码后进行卸车的数据
int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
if(unloadNum > 0){
@@ -13470,6 +13473,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
List<String> orderPackageCodes = new ArrayList<>(orderPackageCodeSet);
+ orderPackageCodes.removeAll(orderPackageCodeList);
+
String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(IncomingTypeEnum.SYNC_INCOMING.getCode());
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content);
From 6579e83e6ad232f87be3f3b46248867617d017e6 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 17:43:33 +0800
Subject: [PATCH 5/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=8D=B8=E8=BD=A6?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/TrunklineCarsLoadServiceImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index ae10cae5a..0a25c70ac 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1207,10 +1207,10 @@ 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);
- throw new CustomerException(400, "配载未到达当前仓");
- }
+// if (!warehouseId.equals(nowWarehouseId)) {
+// log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
+// throw new CustomerException(400, "配载未到达当前仓");
+// }
String loadStatus = carsLoadEntity.getLoadStatus();
From 58fc656af16b64c76ca72bbf511c660bb757a04e Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 17:51:03 +0800
Subject: [PATCH 6/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=8D=B8=E8=BD=A6?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/TrunklineCarsLoadServiceImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 0a25c70ac..34e928150 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1220,10 +1220,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if (unloadType == 1) {
node = WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING;
//网点卸车确认
- if ("40".equals(loadStatus)) {
- log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
- throw new CustomerException(400, "当前节点为终点");
- }
+// if ("40".equals(loadStatus)) {
+// log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
+// throw new CustomerException(400, "当前节点为终点");
+// }
updateUnloadStatus.setId(currentCarsLoadLineEntity.getId());
updateUnloadStatus.setUnloadStatus("1");
currentCarsLoadLineEntity.setUnloadStatus("1");
From ca07a12ab4a055f3b89a6259606b366207a50da2 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 18:06:42 +0800
Subject: [PATCH 7/9] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E5=8D=B8=E8=BD=A6?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/TrunklineCarsLoadServiceImpl.java | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 34e928150..35d521c25 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -9934,6 +9934,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
String packageStatus = advanceDetailEntity.getPackageStatus();
String orderCode = advanceDetailEntity.getOrderCode();
String waybillNo = advanceDetailEntity.getWaybillNo();
+ Long advanceId = advanceDetailEntity.getAdvanceId();
+ TrunklineAdvanceEntity advanceEntity = advanceService.getById(advanceId);
+
+
if ("0".equals(packageStatus)) {
InComingDTO inComingDTO = new InComingDTO();
inComingDTO.setOrderPackageCode(scanCode);
@@ -9949,6 +9953,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
+ if(!Objects.isNull(advanceEntity)){
+ carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+ carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+ carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+ }
+ carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+ carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+ carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+ carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+ carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
}
@@ -9991,6 +10005,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
+ if(!Objects.isNull(advanceEntity)){
+ carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+ carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+ carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+ }
+ carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+ carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+ carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+ carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+ carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
@@ -10022,6 +10046,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
+ if(!Objects.isNull(advanceEntity)){
+ carsLoadScanEntity.setCustomerName(advanceEntity.getCustomerName());
+ carsLoadScanEntity.setCustomerTelephone(advanceEntity.getCustomerPhone());
+ carsLoadScanEntity.setCustomerAddress(advanceEntity.getCustomerAddress());
+ }
+ carsLoadScanEntity.setFirsts(advanceDetailEntity.getFirstPackName());
+ carsLoadScanEntity.setSenconds(advanceDetailEntity.getSecondPackName());
+ carsLoadScanEntity.setThirds(advanceDetailEntity.getThirdPackName());
+ carsLoadScanEntity.setMaterialName(advanceDetailEntity.getMaterialName());
+ carsLoadScanEntity.setMaterialCode(advanceDetailEntity.getMaterialCode());
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
From 2c412f6d00d45fcb12722c2d35e2122b42172c48 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 18:25:27 +0800
Subject: [PATCH 8/9] =?UTF-8?q?1.=E5=94=AE=E5=90=8E=E5=BC=82=E5=B8=B8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/springblade/common/constant/WorkNodeEnums.java | 1 +
.../service/impl/AftersalesAbnormalRecordServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
index bbf747c33..075098679 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
@@ -46,6 +46,7 @@ public enum WorkNodeEnums implements Serializable {
SIGN_DIRECT_SHIPPER(105030,"直发商家签收"),
END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"),
NO_STOCK_CAR(105050, "本车次少货"),
+ NO_DATA(105051, "无效包条码"),
COST_SHARE(105060, "车次成本分摊"),
SORTING_TRAYS(201010, "分拣打托"),
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
index daf8dcbaa..666606365 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
@@ -148,7 +148,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
warehousePackageTrackLogEntity.setOrderPackageCode(orderPackageCode);
warehousePackageTrackLogEntity.setWarehouseId(abnormalRecordDTO.getWarehouseId());
warehousePackageTrackLogEntity.setWarehouseName(abnormalRecordDTO.getWarehouseName());
- warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode());
+ warehousePackageTrackLogEntity.setWorkNode(WorkNodeEnums.NO_DATA.getCode());
warehousePackageTrackLogEntity.setContent("异常处理已确认为无效包条码");
warehousePackageTrackLogEntity.setOperator(AuthUtil.getNickName());
List<JSONObject> ls = new ArrayList<>();
From 10eb18ee10bb247181fe24e985f058a12697511a Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 24 Mar 2025 18:38:48 +0800
Subject: [PATCH 9/9] =?UTF-8?q?1.=E5=94=AE=E5=90=8E=E5=BC=82=E5=B8=B8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/springblade/common/constant/WorkNodeEnums.java | 1 +
.../com/logpm/trunkline/service/impl/InComingServiceImpl.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
index 075098679..d8ca4857a 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
@@ -17,6 +17,7 @@ public enum WorkNodeEnums implements Serializable {
INITIAL_DATA_ENTRY(101010, "数据入库"),
INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
UNLOAD_WAREHOUSE_ENTRY(101021, "卸车并入库"),
+ ERROR_WAREHOUSE_ENTRY(101022, "异常入库"),
OPEN_ORDER(102010, "开单"),
CHANGE_ORDER(102020, "改单"),
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
index c52647bff..0f2ee527a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
@@ -339,6 +339,8 @@ public class InComingServiceImpl implements IInComingService {
if(incomingType.equals(IncomingTypeEnum.PACKAGE_INCOMING.getCode())){
c = WorkNodeEnums.UNLOAD_WAREHOUSE_ENTRY.getCode();
+ }else if(incomingType.equals(IncomingTypeEnum.SYNC_INCOMING.getCode())){
+ c = WorkNodeEnums.ERROR_WAREHOUSE_ENTRY.getCode();
}
//存入日志