From 5110b6563db73a2869e0ac09e717928289cdfdde Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 09:45:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam2.java | 62 ++++++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 26 ++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 +-
src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java | 35 ++++++-----
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/java/com/zy/asrs/service/OpenService.java | 2
7 files changed, 112 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c29c82a..e1b4b0f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -224,7 +224,7 @@
@PostMapping("/palletizing/complete/auth/v1")
@AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
+ @RequestBody PalletizingCompleteParam2 param,
HttpServletRequest request) {
// appkey = "ea1f0459efc02a79f046f982767939ae";
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam2.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam2.java
new file mode 100644
index 0000000..8ffee46
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam2.java
@@ -0,0 +1,62 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
+@Data
+public class PalletizingCompleteParam2 {
+
+ private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮�
+ private Integer palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣浣嶇疆缂栧彿
+ private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷
+ private String orderNo;// 鏄� 瀛楃涓� 璁㈠崟缂栧彿
+ private String uuid;// 鏄� 瀛楃涓� 璁㈠崟缂栧彿
+ private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿
+
+ private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+
+ @Data
+ public static class MatList{
+ private String matnr;// 鏄� 瀛楃涓� 鐗╂枡缂栫爜
+ private String maktx;// 鏄� 瀛楃涓� 鐗╂枡鍚嶇О
+ private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
+ private String position;// 鏄� 瀛楃涓� 鏈ㄧ鐮佸灈浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
+ private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺
+ private Integer anfme;// 鏄� 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲�
+ private String batch;// (鏄惁鍒嗘壒) 瀛楃涓� 鎵规鍙�
+ private String specs;// (鏄惁闇�瑕侊級 瀛楃涓� 瑙勬牸
+ private String standby4;// 鍗蜂俊鎭痷uid
+ private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭�
+ }
+
+ @Data
+ public static class MatDetlList{
+ private String boxNoDetl;// 鏄� 瀛楃涓� 閾滅當缂栧彿锛堝敮涓�瀛楁锛�
+ private String positionDetl;// 鏄� 瀛楃涓� 閾滅當浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
+ private Double weightDetl;// 鏄� 灏忔暟鍨� 閲嶉噺
+ private String batchDetl;// (鏄惁鍒嗘壒) 瀛楃涓� 鎵规鍙�
+ private String specsDetl;// (鏄惁闇�瑕侊級 瀛楃涓� 瑙勬牸
+ }
+
+// public Integer getDevNo$(){
+// if (!Cools.isEmpty(this.palletizingNo)){
+// switch (this.palletizingNo){
+// case "1":
+// return 219;
+// case "2":
+// return 215;
+// case "3":
+// return 118;
+// default:
+// return null;
+// }
+// }
+// return null;
+// }
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 3144915..e58a750 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -50,7 +50,7 @@
void balconyComplete(LabellerMatParam param);
- void palletizingComplete(PalletizingCompleteParam param);
+ void palletizingComplete(PalletizingCompleteParam2 param);
void palletizingCompleteS(PalletizingCompleteParam param);
void singleUnstackingComplete(SingleUnstackingCompleteParam param);
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 dec99b3..5cb32fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -694,7 +694,7 @@
* */
@Override
@Transactional
- public void palletizingComplete(PalletizingCompleteParam param) {
+ public void palletizingComplete(PalletizingCompleteParam2 param) {
Long userId = 7777L;//涓帶
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getBarcode())){
@@ -710,7 +710,7 @@
ArrayList<String> positions = new ArrayList<>(); //鏈ㄧ浣嶇疆鏌ラ噸 (orgin)
ArrayList<String> boxNos = new ArrayList<>(); //鏈ㄧ鍞竴缂栫爜鏌ラ噸 锛坆atch锛�
//鍒ゆ柇matLists鍙傛暟
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
if (Cools.isEmpty(matList.getMatnr())){
throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
}else if (Cools.isEmpty(matList.getPosition())){
@@ -759,7 +759,7 @@
Date now = new Date();
- for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
long rollUp = new Date().getTime();
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -782,7 +782,7 @@
waitPakin.setModiTime(now);
waitPakin.setRollUp(rollUp);
if (!Cools.isEmpty(matList.getMatDetlList())){
- for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
+ for (PalletizingCompleteParam2.MatDetlList matDetlList:matList.getMatDetlList()){
LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
locDetlRullUpDetail.setUuid(rollUp);
locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index cfd3d9e..d872d34 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -61,15 +61,32 @@
|| !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
return FAIL;
}
+ BasDevp basDevp131 = basDevpService.selectById(131);
+ if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y") || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000)){
+ return FAIL;
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
return FAIL;
}
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls) || wrkDetls.size()!=1){
+ return FAIL;
+ }
+ BasDevp basDevp118 = basDevpService.selectById(118);
+ if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
+ return FAIL;
+ }
+ BasDevp basDevp119 = basDevpService.selectById(119);
+ if (Cools.isEmpty(basDevp119) || basDevp119.getReportSign()!=0){
+ return FAIL;
+ }
+ if (basDevp118.getLoading().equals("Y")){
+ //鐢熸垚鏈烘鑷備换鍔�
-
-// TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
+// TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
// try{
// ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
// if (success.getCode()!=200){
@@ -78,6 +95,11 @@
// } catch (Exception e){
// throw new CoolException("妗佹灦涓婁綅杞欢閫�搴撳け璐�");
// }
+ }else {
+ //鐢熸垚鎷嗙洏浠诲姟
+ }
+
+//
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
return FAIL;
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
index 613d2ed..cf5f958 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportToDismantleTheStackHandler.java
@@ -49,6 +49,9 @@
public ReturnT<String> start(int staNo) {
try {
+ if(true){
+ return FAIL;
+ }
BasDevp basDevp = basDevpService.selectById(staNo);
Integer staOther = getStaOther(staNo);
Integer staEnd = getStaEnd(staNo);
@@ -65,7 +68,7 @@
return FAIL;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
- if (!Cools.isEmpty(wrkMast1)) return FAIL;
+ if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts()==51) return FAIL;
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //涓婁紶鍓嶅伐浣滃彿璺熺數鎺х害瀹氫负9992涓帶(妗佹灦)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭紙浣犲彲浠ヨ嚜瀹氫箟锛�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -82,21 +85,21 @@
ReturnT<String> result = null;
result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
// System.out.println(result);
- if (true){
- for (WrkDetl wrkDetl:wrkDetls){
- WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
- wrkDetlSingle.sync(wrkDetl);
- wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
- wrkDetlSingleService.insert(wrkDetlSingle);
- }
- wrkMast.setSheetNo("1");
- wrkMastService.updateById(wrkMast);
- basDevp.setReportSign(1);
- basDevpService.updateById(basDevp);
- basDevpEnd.setReportSign(1);
- basDevpService.updateById(basDevp);
- return SUCCESS;
- }
+// if (true){
+// for (WrkDetl wrkDetl:wrkDetls){
+// WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
+// wrkDetlSingle.sync(wrkDetl);
+// wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
+// wrkDetlSingleService.insert(wrkDetlSingle);
+// }
+// wrkMast.setSheetNo("1");
+// wrkMastService.updateById(wrkMast);
+// basDevp.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// basDevpEnd.setReportSign(1);
+// basDevpService.updateById(basDevp);
+// return SUCCESS;
+// }
if (result.getCode()==200){
for (WrkDetl wrkDetl:wrkDetls){
WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a6d7812..0834de4 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -317,7 +317,7 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1",true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
--
Gitblit v1.9.1