From 4ce0a1b6c7712691a74f76890310f97c48215945 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 25 五月 2023 09:05:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 37 ++++++++++++++++++++-----------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 2 +-
3 files changed, 22 insertions(+), 19 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 2758674..ce3fbbb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -603,7 +603,7 @@
matNew.setTagId(tag.getId());
matNew.setMatnr(param.getPackNo());
matNew.setMaktx(param.getPackName());
- mat.setManuDate(param.getRequestTime());
+ matNew.setManuDate(param.getRequestTime());
matNew.setDeadWarn(480);//8灏忔椂 480鍒嗛挓
matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(now);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1528742..c47a215 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -105,7 +105,7 @@
if (sourceStaNo.equals(202)) {
whsType = 1;
locTypeDto.setLocType1((short) 1);
- } else if (sourceStaNo.equals(209)) {
+ } else if (sourceStaNo.equals(206)) {
whsType = 2;
locTypeDto.setLocType1((short) 2);
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 665cec7..5f0a27d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -73,27 +73,30 @@
return R.error("packNo涓嶈兘涓虹┖");
}
Date now = new Date();
- if (param.getSourceStaNo()==109){
+ if (true){
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("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ int i = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ if(i==0){
+ 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){
@@ -105,9 +108,9 @@
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins) || waitPakins.size()!=1) {
+ if (Cools.isEmpty(waitPakins) || waitPakins.size() !=1) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null || waitPakins.size()!=1) {
+ if (wrkMast != null || waitPakins.size() !=1) {
return R.parse("600-閲嶅缁勬墭");
}
return R.parse(CodeRes.NO_COMB_700);
--
Gitblit v1.9.1