From e67cb04af87e32a19c2b1e0756e6e8c6d0c7d1f8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 12 一月 2025 14:50:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
index 9ecfaf4..4d7a462 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteTwoFloorParam.java
@@ -22,13 +22,16 @@
private String maktx;// 鏄� 鐗╂枡鍚嶇О //涓嶉渶瑕�
private String batch;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
private String model;// 鏄� 瀛楃涓� 鍗风紪鍙凤紙鍞竴瀛楁锛�
- private String position;// 鏄� 瀛楃涓� 鏈ㄧ鐮佸灈浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
+ private String position;// 鏄� 瀛楃涓� 鏈ㄧ鐮佸灈浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 {"1":宸︺��"2":鍙硙:瀛楃涓诧紝锛堥潰鏈濈珛搴撹揣鏋讹紝鑳屽妗佹灦锛�
private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 鍑�閲�
private Double roughWeight;// 鏄� 灏忔暟鍨� 閲嶉噺 姣涢噸
private Double anfme=1.0;// 鏄� 灏忔暟鍨� //榛樿
private Double rollExtent;// 鏄� 灏忔暟鍨� 鍗烽暱搴�
- private int joint;// 鏄� 鏁村瀷 鎺ュご
+ private int joint = 0;// 鏄� 鏁村瀷 鎺ュご
+ private int cutting = 2;// 鏄� 鏁村瀷 鏄惁鍒嗗垏锛歿1:鏄��2:鍚
+ private int qualified = 2;// 鏄� 鏁村瀷 鏄惁鍚堟牸锛歿1:鏄��2:鍚
+ private String modelFront = "";// 鏄� 鍒嗗垏鍓嶇鍙�
+ private String batchFront = "";// 鏄� 鍒嗗垏鍓嶅嵎鍙�
}
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index b65977e..39f9afb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -725,9 +725,9 @@
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
}else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
}
// else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
--
Gitblit v1.9.1