From 6eecac9d82c970acf021669e3bb4cd782f36bbfe Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 11:34:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
index 36cc902..345e918 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -14,12 +14,12 @@
public class SingleMountUnstackingCompleteParam {
private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
private String boxType;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級
- private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級
+ private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈鏈ㄧ绫诲瀷锛堝悓涓�鎵樼洏涓�绉嶇被鍨嬶級 搴熷純
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
private Integer staStart;// 鏄� 瀛楃涓� 璧峰绔欑偣锛堟墭鐩樻墍鍦ㄧ珯鐐癸級
private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣绔欑偣锛堟媶鍨涚洰鐨勭珯鐐癸級
- private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
@Data
public static class MatList{
@@ -37,13 +37,42 @@
createTime=now.toString();
uuid=String.valueOf(now.getTime());
List<MatList> matLists=new ArrayList<>();
- for (WrkDetl wrkDetl:wrkDetlList){
- MatList matList = new MatList();
- matList.setBoxNo(wrkDetl.getBatch());
- matList.setPosition(wrkDetl.getOrigin());
- matList.setUnstackingEnd(false);
- matLists.add(matList);
+ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==120){
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("1")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("2")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ }else {
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("2")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
+ for (WrkDetl wrkDetl:wrkDetlList){
+ if (wrkDetl.getOrigin().equals("1")) continue;
+ MatList matList = new MatList();
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setUnstackingEnd(false);
+ matLists.add(matList);
+ }
}
- this.matLists = matLists;
+
+ this.matList = matLists;
}
}
--
Gitblit v1.9.1