From d372d7d03bd553d369e0fcb0fb9c20f1e4155f8a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 29 二月 2024 17:23:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 104 ++++++++++++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 51 deletions(-)
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 071344a..7aa331b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -699,64 +699,65 @@
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
- }else if (Cools.isEmpty(param.getPalletizingNo())){
- throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
- }else if (Cools.isEmpty(param.getBoxType())){
- throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
+// }else if (Cools.isEmpty(param.getPalletizingNo())){
+// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+// }else if (Cools.isEmpty(param.getBoxType())){
+// throw new CoolException("鍙傛暟锛氭湪绠辩被鍨� boxType涓虹┖");
}else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
- throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matList涓虹┖");
}
- String matnrOne = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 1銆佸乏
- String matnrTwo = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 2銆佸彸
- ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
+// String matnrOne = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 1銆佸乏
+// String matnrTwo = "";//鏈ㄧ鐩稿悓浣嶇疆 瑙勬牸 matnr鏍￠獙 2銆佸彸
+// ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
//鍒ゆ柇matLists鍙傛暟
for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
if (Cools.isEmpty(matList.getMatnr())){
throw new CoolException("鍙傛暟锛氳鏍� matnr涓虹┖");
- }else if (Cools.isEmpty(matList.getPosition())){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
- }else if (Cools.isEmpty(matList.getBatch())){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 batch涓虹┖");
- }else if (Cools.isEmpty(matList.getModel())){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗峰彿 model涓虹┖");
- }else if (Cools.isEmpty(matList.getBatch())){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
- }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");
- }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");
+// }else if (Cools.isEmpty(matList.getPosition())){
+// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
+// }else if (Cools.isEmpty(matList.getBatch())){
+// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 batch涓虹┖");
+// }else if (Cools.isEmpty(matList.getModel())){
+// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗峰彿 model涓虹┖");
+// }else if (Cools.isEmpty(matList.getBatch())){
+// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
+// }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");
+// }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銆佸彸
- if (!matnrOne.equals("")){
- if (!matnrOne.equals(matList.getMatnr())){
- throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
- }
- }else {
- matnrOne=matList.getMatnr();
- }
- }else if (matList.getPosition().equals("2")){
- if (!matnrTwo.equals("")){
- if (!matnrTwo.equals(matList.getMatnr())){
- throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
- }
- }else {
- matnrTwo=matList.getMatnr();
- }
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ浣嶇疆閿欒锛�"+matList.getPosition());
- }
-
- if (!boxNos.contains(matList.getBatch())){
- boxNos.add(matList.getBatch());
- }else {
- throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
- }
+// if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
+// if (!matnrOne.equals("")){
+// if (!matnrOne.equals(matList.getMatnr())){
+// throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+// }
+// }else {
+// matnrOne=matList.getMatnr();
+// }
+// }else if (matList.getPosition().equals("2")){
+// if (!matnrTwo.equals("")){
+// if (!matnrTwo.equals(matList.getMatnr())){
+// throw new CoolException("鏈ㄧ浣嶇疆锛�"+matList.getPosition()+"瀛樺湪涓嶅悓瑙勬牸鍗蜂俊鎭�");
+// }
+// }else {
+// matnrTwo=matList.getMatnr();
+// }
+// }else {
+// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ浣嶇疆閿欒锛�"+matList.getPosition());
+// }
+//
+// if (!boxNos.contains(matList.getBatch())){
+// boxNos.add(matList.getBatch());
+// }else {
+// throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBatch()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
+// }
}
// BasDevp basDevp = basDevpService.selectById(Integer.parseInt(param.getDevNo$()));
@@ -806,8 +807,9 @@
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
-// waitPakin.setRoughWeight(matList.getRoughWeight()); //姣涢噸
-// waitPakin.setRollExtent(matList.getRollExtent()); //闀垮害
+ waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
+ waitPakin.setPrice(matList.getRollExtent()); //闀垮害
+ waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
--
Gitblit v1.9.1