From 288e45a990a5abf4ab50f820ed4e870e8314468e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:14:10 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/common/web/WcsController.java | 117 +++++++++++++---------------------------------------------
1 files changed, 27 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 275e4fd..d1c0b90 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -52,10 +52,10 @@
@Autowired
private MatService matService;
- @Value("mes.url")
+ @Value("${mes.url}")
private String mesUrl;
- @Value("mes.inPath")
+ @Value("${mes.inPath}")
private String inpath;
@PostMapping("/pakin/loc/v1")
@@ -68,85 +68,41 @@
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())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakins) || waitPakins.size() !=1) {
+ List<WaitPakin> beBatch = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("be_batch", 1));
+ if(beBatch.size() > 1){
+ return R.error("缁勬墭妗ｄ腑鏈夊鏉℃惉杩愪换鍔�");
+ }else if(Cools.isEmpty(beBatch)){
+ return R.error("缁勬墭妗ｄ腑娌℃湁鎼繍浠诲姟");
+ }
+ if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
- if (wrkMast != null || waitPakins.size() !=1) {
+ if (wrkMast != null) {
return R.parse("600-閲嶅缁勬墭");
}
- return R.parse(CodeRes.NO_COMB_700);
- }
- int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
- .eq("io_status", "Y"));
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0 || countWait > 0) {
- if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
- return R.error(CodeRes.EXIST_500);
+ for (WaitPakin waitPakin : beBatch) {
+ waitPakin.setZpallet(param.getBarcode());
+ waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("be_batch",1));
+ }
+ }else {
+ int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
+ .eq("io_status", "Y"));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0 || countWait > 0) {
+ if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
+ return R.error(CodeRes.EXIST_500);
+ }
}
}
+
}
if (Cools.isEmpty(param.getLocType1())){
param.setLocType1((short)1);
@@ -154,8 +110,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 +183,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 +202,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());
@@ -291,17 +239,6 @@
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }else{
- if (locMast.getRow1()<2){
- //1.鎵爜涓婃姤
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
- combParam.setLocNo(wrkMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(1);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
- }
}
} else {
throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
--
Gitblit v1.9.1