From ce37e4c4e4b74b138bbc12417b7f220f73c6083f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 20:23:00 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 26dc432..67d38e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -248,6 +248,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
wrkMast.setIoType(104); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setPdcType("N");
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -573,6 +574,7 @@
}
Date now = new Date();
+ Integer freqType = resolveCombFreqType(param.getCombMats());
boolean allEmpty = true;
if (param.getCombMats() != null) {
for (CombParam.CombMat mat : param.getCombMats()) {
@@ -615,6 +617,12 @@
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setFreqType(freqType);
+ waitPakin.setContainerNo(param.getContainerNo());
+ waitPakin.setTeu(param.getTeu());
+ waitPakin.setPlateNo(param.getPlateNo());
+ waitPakin.setTrainNo(param.getTrainNo());
+ waitPakin.setCubeNumber(param.getCubeNumber());
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
@@ -680,6 +688,12 @@
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setFreqType(freqType);
+ waitPakin.setContainerNo(param.getContainerNo());
+ waitPakin.setTeu(param.getTeu());
+ waitPakin.setPlateNo(param.getPlateNo());
+ waitPakin.setTrainNo(param.getTrainNo());
+ waitPakin.setCubeNumber(param.getCubeNumber());
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
@@ -703,6 +717,26 @@
// orderService.updateSettle(order.getId(), 2L, userId);
OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
}
+ }
+
+ private Integer resolveCombFreqType(List<CombParam.CombMat> combMats) {
+ Integer resolvedFreqType = null;
+ if (Cools.isEmpty(combMats)) {
+ return null;
+ }
+ for (CombParam.CombMat combMat : combMats) {
+ if (combMat == null || combMat.getFreqType() == null || combMat.getFreqType() <= 0) {
+ continue;
+ }
+ if (resolvedFreqType == null) {
+ resolvedFreqType = combMat.getFreqType();
+ continue;
+ }
+ if (!resolvedFreqType.equals(combMat.getFreqType())) {
+ throw new CoolException("缁勬墭璐х墿棰戞涓嶄竴鑷�");
+ }
+ }
+ return resolvedFreqType;
}
@@ -1055,6 +1089,7 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
Date now = new Date();
+ Integer freqType = resolveCombFreqType(param.getCombMats());
boolean packDown = Parameter.get().getPackDown().equals("true");
@@ -1188,6 +1223,7 @@
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setFreqType(freqType);
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
@@ -1316,6 +1352,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setPdcType("N");
wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
--
Gitblit v1.9.1