From 9ac70efe81c1909d63b89f9b18c4f367c0584ceb Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 四月 2025 16:04:00 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/common/web/WcsController.java | 71 ++---------------------------------
1 files changed, 4 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8e622ae..3d85ce9 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -68,63 +68,8 @@
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
- }
- boolean logs=true;
- TestMast testMast11=new TestMast();
- //濡傛灉pack鐮佷负绌猴紝鏌ユ祴璇曡〃
- if (Cools.isEmpty(param.getPackNo())) {
- testMast11= testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("user_id",param.getBarcode())//鏌ユ墭鐩樼爜
- .eq("status",4)); //瀹屾垚娴嬭瘯
- logs=false;
- }else{
- LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>()
- .eq("matnr",param.getPackNo())
- .or()
- .eq("zpallet",param.getBarcode()));
- if(!Cools.isEmpty(locDetl)){
- return R.error("PACK鐮佸湪搴擄紒锛侊紒锛�");
- }
- }
Date now = new Date();
- if (true){
- try{
- Mat mat=new Mat();
- if(logs){
- mat = matService.selectByMatnr(param.getPackNo());
- }else {
- mat = matService.selectByMatnr(testMast11.getBarcode());
- }
-
- if (Cools.isEmpty(mat)){
- return R.error("鍟嗗搧淇℃伅妗ｆ鏈煡璇㈠埌pack淇℃伅"+param.getPackNo());
- }
- WaitPakin waitPakin = new WaitPakin();
- 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){
-
- }
- }
List<WaitPakin> waitPakins = null;
if (param.getIoType() == 1) {
if (Cools.isEmpty(param.getBarcode())) {
@@ -154,8 +99,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
-// sourceStaNo.setLocType1(param.getLocType1());
- sourceStaNo.setLocType1((short)1);
+ sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -228,7 +172,8 @@
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
- .eq("barcode", wrkDetl.getMatnr()));//pack鐮�
+ .eq("barcode", wrkDetl.getMatnr())
+ .eq("user_id",wrkDetl.getZpallet()));//pack鐮�
if (Cools.isEmpty(testMast)){
//鐢熸垚娴嬭瘯妗�
testMast=new TestMast();
@@ -246,14 +191,6 @@
testMast.setAppeTime(now);
if (!testMastService.insert(testMast)){
throw new CoolException(wrkDetl.getMatnr()+"鐢熸垚娴嬭瘯妗ｅけ璐�");
- }
- }else if(wrkMast.getStaNo()==209){
- testMast.setBarcode(wrkDetl.getMatnr());
- testMast.setLocNo(locMast.getLocNo());
- testMast.setUserId(wrkMast.getBarcode());//鎵樼洏鐮�
- testMast.setAppeTime(now);
- if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("barcode", wrkDetl.getMatnr()))){
- throw new CoolException(wrkDetl.getMatnr()+"鏇存柊娴嬭瘯妗ｅけ璐�");
}
}else {
testMast.setBarcode(wrkDetl.getMatnr());
@@ -301,7 +238,7 @@
combParam.setPackSts(0);
combParam.setStepSts(1);
combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
}
} else {
--
Gitblit v1.9.1