From 17485bf8af53591618ca052dfb76559b8e67ce51 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期六, 20 五月 2023 11:13:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 41 ++++----
src/main/java/com/zy/common/web/param/SearchLocParam.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 7 +
src/main/java/com/zy/asrs/controller/OpenController.java | 6
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 20 ++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 38 +++---
src/main/java/com/zy/common/web/WcsController.java | 79 +++++++++++----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 76 +++++++-------
9 files changed, 155 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 47b41f3..8d87b23 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -216,16 +216,16 @@
}
@PostMapping("/rpc/pakIn/auth/v1")
- @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ @AppAuth(memo = "PACK淇℃伅涓嬪彂")
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request) {
- log.info("鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�"+appkey+param);
+ log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤"+appkey+param);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- //鐢熸垚鍏ュ簱閫氱煡妗�
+ //鐢熸垚鍟嗗搧妗ｆ
openService.combPACK(param);
// Map<String, Boolean> map = new HashMap<>();
// map.put("isComplete", true);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index f91ade5..8fae212 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -672,7 +672,7 @@
}
//3.寮�濮嬫祴璇曚笂鎶�
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(testMast.getBarcode());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(0);
combParam.setStepSts(3);
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 5334814..2758674 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,65 +573,65 @@
throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
}else if (Cools.isEmpty(param.getPackName())){
throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
-// }else if (Cools.isEmpty(param.getSettingTimes())){
-// throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
}else if (Cools.isEmpty(param.getRequestTime())){
- throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+ throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");//姝ゅ弬鏁板～鍏ョ敓浜ф棩鏈熶竴鏍� 涓嶇敤鍙叧闂�
}
if (Cools.isEmpty(param.getPackNo())) {
throw new CoolException(BaseRes.PARAM);
}
- // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
+// // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
- int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
- }else if (countPakin>0){
- throw new CoolException("閲嶅鐢宠" + param.getPackNo());
- }
+// int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
+// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
+// int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
+// if (countLoc > 0 || countWrk > 0) {
+// throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+// }else if (countPakin>0){
+// throw new CoolException("閲嶅鐢宠" + param.getPackNo());
+// }
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(param.getPackName());
+ Mat mat = matService.selectByMatnr(param.getPackNo());
+ Date now = new Date();
if (Cools.isEmpty(mat)) {
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
Mat matNew = new Mat();
matNew.setTagId(tag.getId());
- matNew.setMatnr(param.getPackName());
+ matNew.setMatnr(param.getPackNo());
matNew.setMaktx(param.getPackName());
+ mat.setManuDate(param.getRequestTime());
matNew.setDeadWarn(480);//8灏忔椂 480鍒嗛挓
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setCreateTime(new Date());
+ matNew.setCreateTime(now);
matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setUpdateTime(new Date());
+ matNew.setUpdateTime(now);
if (!matService.insert(matNew)){
throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ鑷姩鐢熸垚澶辫触");
}
- mat=matNew;
+// mat=matNew;
// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
- WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
- waitPakin.setMatnr(param.getPackName());
- waitPakin.setMaktx(param.getPackName());
- waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(1.0); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setManuDate(param.getRequestTime());
- waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(new Date());
- waitPakin.setModiUser(null);
- waitPakin.setModiTime(new Date());
- waitPakin.setDeadWarn(mat.getDeadWarn());
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
+// WaitPakin waitPakin = new WaitPakin();
+//// waitPakin.sync(mat);
+// waitPakin.setMatnr(param.getPackName());
+// waitPakin.setMaktx(param.getPackName());
+// waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(1.0); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setManuDate(param.getRequestTime());
+// waitPakin.setAppeUser(null);
+// waitPakin.setAppeTime(new Date());
+// waitPakin.setModiUser(null);
+// waitPakin.setModiTime(new Date());
+// waitPakin.setDeadWarn(mat.getDeadWarn());
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
}
@Override
@Transactional
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index ce55486..6970920 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -68,9 +68,10 @@
);
if (!Cools.isEmpty(locMasts)){
for (LocMast locMast:locMasts){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr())
.eq("status",4)
);
if (!Cools.isEmpty(testMast)){
@@ -84,7 +85,7 @@
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
//4.娴嬭瘯瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(locDetl.getMatnr());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(2);
combParam.setStepSts(4);
@@ -119,11 +120,13 @@
);
if (!Cools.isEmpty(locMasts2)){
for (LocMast locMast:locMasts2){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
.eq("loc_no",locMast.getLocNo())
- .eq("barcode",locMast.getBarcode())
+ .eq("barcode",locDetl.getMatnr())
.eq("status",4)
);
+ boolean sign=false;
if (!Cools.isEmpty(testMast)){
if (testMast.getStatus()==4){
//绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
@@ -134,15 +137,7 @@
if (targetLocNo != null){
//鐢熸垚鍑哄簱浠诲姟
if (outLoc(locMast)){
- //4.娴嬭瘯瀹屾垚涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setStepSts(4);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
- return SUCCESS;
+ sign=true;
}
}else {
//3\4鎺掓弧 鍚�2鎺掔Щ搴擄紝鏌ヨ鐩爣搴撲綅
@@ -152,15 +147,7 @@
}
if (targetLocNo != null){
workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
- //4.娴嬭瘯瀹屾垚涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setStepSts(4);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
- return SUCCESS;
+ sign=true;
}else {
log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
}
@@ -168,9 +155,21 @@
}else if (testMast.getStatus()!=4) {
log.error("娴嬭瘯鐘舵�佸紓甯�,搴撲綅鍙蜂负锛�" + testMast.getLocNo());
}
+
}else {
log.error("娴嬭瘯搴撲綅锛�"+locMast.getLocNo()+"鎵�灞炴祴璇曟。涓虹┖鎴栬�呬笉鐘舵�佷负4");
}
+ if (sign){
+ //4.娴嬭瘯瀹屾垚涓婃姤
+ CombParam combParam = new CombParam();
+ combParam.setPackNo(locDetl.getMatnr());
+ combParam.setLocNo(locMast.getLocNo());
+ combParam.setPackSts(1);
+ combParam.setStepSts(4);
+ combParam.setRequestTime(DateUtils.convert(new Date()));
+ new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+ return SUCCESS;
+ }
}
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
index 6df2d13..b0fc8b7 100644
--- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java
@@ -70,18 +70,18 @@
//闈欑疆瀹屾垚鍑哄簱绔�104
for(LocMast locMast : locMasts){
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (Cools.isEmpty(locDetl)){
+ if (Cools.isEmpty(locDetl) || Cools.isEmpty(locDetl.getMatnr())){
log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁鏄庣粏");
- } else if (Cools.isEmpty(locDetl.getDeadWarn())){
- log.error("搴撲綅:"+locMast.getLocNo()+"娌℃湁闈欑疆鏃堕棿");
+ continue;
+ }
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (Cools.isEmpty(mat)){
+ log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
+ }else if (Cools.isEmpty(mat.getDeadWarn())){
+ log.error("pack:"+mat.getMatnr()+"娌℃湁闈欑疆鏃堕棿");
} else if (Cools.isEmpty(locMast.getModiTime())){
log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
- } else if (Cools.isEmpty(locMast.getBarcode())){
- log.error("搴撲綅:"+locMast.getLocNo()+"Pack鐮佷负绌�");
- } else if (Cools.isEmpty(mat)){
- log.error("搴撲綅:"+locMast.getLocNo()+"鍟嗗搧鎵�灞炲晢鍝佹。妗堜负绌�");
- } else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
+ }else if (now.getTime()-locMast.getModiTime().getTime() >= mat.getDeadWarn()*60*1000){
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
@@ -128,7 +128,7 @@
locMast.setPackStatus(6); //6:闈欑疆瀹屾垚
CombParam combParam = new CombParam();
- combParam.setPackNo(locMast.getBarcode());
+ combParam.setPackNo(mat.getMatnr());
combParam.setLocNo(locMast.getLocNo());
combParam.setPackSts(6);
combParam.setStepSts(1);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index df8a73b..f1af496 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -64,13 +64,13 @@
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (wrkMast.getWrkSts() == 5 && wrkMast.getIoType() == 1) {
if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
-// combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(1);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMaktx());
+// combParam.setLocNo(wrkMast.getLocNo());
+// combParam.setPackSts(1);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
WaitPakin pakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (pakin!=null){
@@ -84,19 +84,19 @@
}
}
} else if (wrkMast.getWrkSts() == 15 && wrkMast.getIoType() == 101){
- if(wrkDetl != null){
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getZpallet());
-// combParam.setPackName(wrkDetl.getMatnr());
- combParam.setLocNo(wrkMast.getSourceLocNo());
-// combParam.setPackSts(0);
- combParam.setRequestTime(DateUtils.convert(new Date()));
- result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,outPath,combParam);
- }
+// if(wrkDetl != null){
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(wrkDetl.getMatnr());
+//// combParam.setPackName(wrkDetl.getMatnr());
+// combParam.setLocNo(wrkMast.getSourceLocNo());
+//// combParam.setPackSts(0);
+// combParam.setRequestTime(DateUtils.convert(new Date()));
+// result = new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,outPath,combParam);
+// }
}
- if(null != result && !result.isSuccess()){
- return result;
- }
+// if(null != result && !result.isSuccess()){
+// return result;
+// }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 3741792..508937f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -174,7 +174,7 @@
}
//2.鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setPackNo(wrkDetls.get(0).getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
if (locMast.getCrnNo()==1){
combParam.setPackSts(0);
@@ -346,6 +346,8 @@
locMast.setIoTime(now);
locMast.setModiTime(now);
locMast.setFireStatus(0);
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+
boolean sign =false;
if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
@@ -377,10 +379,11 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
+
if (locMast.getCrnNo()==1 && sign){
//5.闈欑疆搴撲綅鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setPackNo(locDetl.getMatnr());
combParam.setLocNo(wrkMast.getLocNo());
if (locMast.getPackStatus()==4){
combParam.setPackSts(2);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 66d1c52..665cec7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -49,6 +49,8 @@
private LocDetlService locDetlService;
@Autowired
private TestMastService testMastService;
+ @Autowired
+ private MatService matService;
@Value("mes.url")
private String mesUrl;
@@ -66,16 +68,47 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+
+ if (Cools.isEmpty(param.getPackNo())) {
+ return R.error("packNo涓嶈兘涓虹┖");
+ }
+ Date now = new Date();
+ if (param.getSourceStaNo()==109){
+ try{
+ Mat mat = matService.selectByMatnr(param.getPackNo());
+ if (Cools.isEmpty(mat)){
+ return R.error("鍟嗗搧淇℃伅妗ｆ鏈煡璇㈠埌pack淇℃伅"+param.getPackNo());
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.setMatnr(mat.getMatnr());// Pack鐮�
+ waitPakin.setMaktx(mat.getMaktx());
+ waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(1.0); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setManuDate(mat.getManuDate());
+ waitPakin.setAppeUser(null);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(null);
+ waitPakin.setModiTime(now);
+ waitPakin.setDeadWarn(mat.getDeadWarn());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }catch (Exception e){
+
+ }
+ }
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins)) {
+ if (Cools.isEmpty(waitPakins) || waitPakins.size()!=1) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null && wrkMast.getIoType() == 103) {
- return R.parse(CodeRes.PICK_600);
+ if (wrkMast != null || waitPakins.size()!=1) {
+ return R.parse("600-閲嶅缁勬墭");
}
return R.parse(CodeRes.NO_COMB_700);
}
@@ -152,6 +185,9 @@
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ // 鐩爣搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
@@ -163,6 +199,24 @@
wrkDetl.setDeadWarn(waitPakin.getDeadWarn());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("barcode", wrkMast.getBarcode()));
+
+ if (Cools.isEmpty(testMast)){
+ //鐢熸垚娴嬭瘯妗�
+ testMast=new TestMast();
+ testMast.setChannel(locMast.getChannel());
+ testMast.setUserId(locMast.getLocNo());
+ testMast.setStatus(1);
+ testMast.setBarcode(wrkDetl.getMatnr());
+ testMast.setLocNo(locMast.getLocNo());
+ testMast.setModiTime(now);
+ testMast.setAppeTime(now);
+ if (!testMastService.insert(testMast)){
+ throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
+ }
+ }else {
+ throw new CoolException(wrkDetl.getMatnr()+"宸插瓨鍦ㄦ祴璇曟。");
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
@@ -182,7 +236,6 @@
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
@@ -202,24 +255,6 @@
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
- }
- TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("barcode", wrkMast.getBarcode()));
-
- if (Cools.isEmpty(testMast)){
- //鐢熸垚娴嬭瘯妗�
- testMast=new TestMast();
- testMast.setChannel(locMast.getChannel());
- testMast.setUserId(locMast.getLocNo());
- testMast.setStatus(1);
- testMast.setBarcode(wrkMast.getBarcode());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setModiTime(now);
- testMast.setAppeTime(now);
- if (!testMastService.insert(testMast)){
- throw new CoolException(wrkMast.getBarcode()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
- }
- }else {
- throw new CoolException(wrkMast.getBarcode()+"宸插瓨鍦ㄦ祴璇曟。");
}
return dto;
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index 1a170ce..ef936c8 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -14,6 +14,8 @@
private String barcode;
+ private String packNo;
+
// 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
private Short locType1;
--
Gitblit v1.9.1