From bc8e064b89dcb9cf3500a5aeaaecf9e0a7f6b4ab Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 21 七月 2023 09:19:21 +0800
Subject: [PATCH] #桁架上位软件：单托拆垛完成通知 接口实装
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12 ++++-
src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java | 2
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | 1
src/main/java/com/zy/asrs/entity/WrkMast.java | 4 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++---
5 files changed, 87 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a5810cb..d6459bb 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -33,6 +33,9 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
+ * */
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
@@ -43,12 +46,18 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭壒娆�
+ * */
@ApiModelProperty(value= "鍨嬪彿")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩被鍨�
+ * */
@ApiModelProperty(value= "鍝佺墝")
private String brand;
@@ -58,9 +67,6 @@
@ApiModelProperty(value= "鍗曚环")
private Double price;
- /*
- * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
- * */
@ApiModelProperty(value= "sku")
private String sku;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 83298e9..30bdbc0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -65,6 +65,10 @@
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鏈媶 1: 宸叉媶
+ */
@ApiModelProperty(value= "")
@TableField("sheet_no")
private String sheetNo;
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
index f236e11..df3a2e8 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
@@ -12,6 +12,7 @@
private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private String boxType;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
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 1c58411..34563b5 100644
--- a/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/SingleMountUnstackingCompleteParam.java
@@ -12,7 +12,7 @@
private String palletizingNo;// 鏄� 瀛楃涓� 鎷嗗灈浣嶇紪鍙�
private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
private String uuid;// 鏄� 瀛楃涓� 鏃堕棿鎴�
- private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+ private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈鍓╀綑璐х墿淇℃伅(鍙互涓虹┖)
@Data
public static class MatList{
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 bde2944..8bcba1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -673,9 +673,14 @@
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.getMatLists()) || param.getMatLists().size()==0){
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
+
+ ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
+ ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
//鍒ゆ柇matLists鍙傛暟
for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
if (Cools.isEmpty(matList.getMatnr())){
@@ -688,6 +693,18 @@
throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ涓摐绠旀暟閲� anfme涓虹┖");
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細閲嶉噺 weight涓虹┖");
+ }
+
+ if (!positions.contains(matList.getPosition())){
+ positions.add(matList.getPosition());
+ }else {
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅锛�"+matList.getPosition());
+ }
+
+ if (!boxNos.contains(matList.getBoxNo())){
+ boxNos.add(matList.getBoxNo());
+ }else {
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ缂栫爜瀛樺湪閲嶅");
}
}
@@ -729,9 +746,10 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(matList.getBatch()); //鎵规
+ waitPakin.setModel(matList.getBatch()); //鎵规
waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
- waitPakin.setSku(matList.getBoxNo()); //鏈ㄧ缂栫爜
+ waitPakin.setBatch(matList.getBoxNo()); //鏈ㄧ缂栫爜
+ waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
@@ -782,7 +800,7 @@
}
boolean sign=true;
for (WrkDetl wrkDetl:wrkDetls){
- if (wrkDetl.getSku().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
+ if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
wrkDetl.setInspect(1);
wrkDetlService.updateById(wrkDetl);
wrkDetlsNew.add(wrkDetl);
@@ -813,9 +831,8 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("鐢熸垚宸ヤ綔妗ｅけ璐�");
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("鐢熸垚宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
}
for (WrkDetl wrkDetl : wrkDetlsNew){
@@ -824,7 +841,7 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟鎷嗗灈瀹屾垚閫氱煡");
}
}
@@ -837,7 +854,55 @@
@Transactional
public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
Long userId = 8888L;//妗佹灦涓婁綅杞欢
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }else if (Cools.isEmpty(param.getPalletizingNo())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+ }
+ WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMastMatrix)){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
+ }else {
+ if (!wrkMastMatrix.getIoType().equals(101)){
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
+ if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0 || param.getMatLists().size()!=wrkDetls.size()){
+ throw new CoolException("杩斿洖鐗╂枡鏄庣粏鏁颁负"+param.getMatLists().size()+",鎵樼洏鐮侊細"+param.getBarcode()+"搴斿墿浣欑墿鏂欐暟锛�"+wrkDetls.size());
+ }
+ ArrayList<String> orgin = new ArrayList<>();
+ //鍒ゆ柇matLists鍙傛暟
+ for (SingleMountUnstackingCompleteParam.MatList matList : param.getMatLists()){
+ if (Cools.isEmpty(matList.getPosition())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缃� position涓虹┖");
+ }else if (Cools.isEmpty(matList.getBoxNo())){
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo涓虹┖");
+ }
+ if (!orgin.contains(matList.getPosition())){
+ orgin.add(matList.getPosition());
+ }else {
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+",鏈ㄧ浣嶇疆瀛樺湪閲嶅");
+ }
+ boolean sign=true;
+ for (WrkDetl wrkDetl:wrkDetls){
+ if (wrkDetl.getBatch().equals(matList.getBoxNo())){//鏈ㄧ缂栫爜
+ wrkDetl.setOrigin(matList.getPosition());
+ wrkDetlService.updateById(wrkDetl);
+ sign=false;
+ break;
+ }
+ }
+ if (sign){
+ throw new CoolException("鍙傛暟锛氭湪绠辩紪鍙� boxNo:"+matList.getBoxNo()+"鏈煡璇㈠埌瀵瑰簲鐨勫伐浣滄槑缁嗭紒");
+ }
+ }
+ }
+ }
+
+ wrkMastMatrix.setSheetNo("1");
+ if (!wrkMastService.updateById(wrkMastMatrix)){
+ throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
+ }
}
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1