From bd98e9fe7866af872035c9f198786cbbff123275 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 24 十一月 2024 15:19:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 c9046a7..50ea838 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -40,7 +40,9 @@
@Service
public class MobileServiceImpl implements MobileService {
-
+ public static final List<Integer> OVER_TORN_STA_NO_LIST = new ArrayList<Integer>() {{
+ add(126);add(131);add(310);add(312);
+ }};
@Autowired
private MatService matService;
@@ -243,7 +245,7 @@
}
List<String> orderBoxNoList = new ArrayList<>();
for (OrderDetl orderDetl: orderDetls){
- if (orderDetl.getWorkQty()==0){
+ if (orderDetl.getWorkQty().equals(0.0)){
orderBoxNoList.add(orderDetl.getBatch());
}
}
@@ -253,9 +255,9 @@
List<String> matListBoxNoList = new ArrayList<>();
for (TrussCombParam.MatList matList: param.getMatList()){
if (!orderBoxNoList.contains(matList.getBatch())){
- throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
+ throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 鎵规锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
}else {
- matListBoxNoList.add(matList.getBoxNo());
+ matListBoxNoList.add(matList.getBatch());
}
}
List<OrderDetl> orderDetlList = new ArrayList<>();
@@ -297,6 +299,10 @@
waitPakin.setBatch(orderDetl.getBatch()); //鏈ㄧ缂栫爜
waitPakin.setBrand(orderDetl.getBrand()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+ waitPakin.setWeight(orderDetl.getWeight()); //鍑�閲�
+ waitPakin.setVolume(orderDetl.getVolume()); //姣涢噸
+ waitPakin.setPrice(orderDetl.getPrice()); //闀垮害
+ waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs())); //鎺ュご MES璁㈠崟鍙�
waitPakin.setOrigin("1"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(orderDetl.getAnfme()); // 鏈ㄧ涓摐绠旀暟閲�
@@ -463,8 +469,6 @@
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
- }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご joint涓虹┖");
}
if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
@@ -529,7 +533,7 @@
matnr = matList.getMatnr();
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 鎵规
waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
@@ -537,7 +541,7 @@
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
- waitPakin.setSpecs(String.valueOf(matList.getJoint())); //闀垮害
+ waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご MES璁㈠崟鍙�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -1124,8 +1128,8 @@
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setSheetNo("0"); //寰愬伐姹変簯鎷嗗灈鏍囪锛�0: 鍒濆 1: 鏈媶 2:宸叉媶 3锛氬凡澶勭悊鍙笅涓�姝ワ紙杞巻鍙叉。锛�
- if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
- wrkMast.setSheetNo("3");
+ if (!OVER_TORN_STA_NO_LIST.contains(staDesc.getStnNo())){
+ wrkMast.setSheetNo("2");
}
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
--
Gitblit v1.9.1