From 4d0fb4ddb8d307088c8a41399dc436cdaa3d4d2c Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 02 十二月 2024 09:06:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 64 +++-----------------------------
1 files changed, 6 insertions(+), 58 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..6c5a1ae 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")
@@ -71,60 +71,7 @@
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 +101,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
-// sourceStaNo.setLocType1(param.getLocType1());
- sourceStaNo.setLocType1((short)1);
+ sourceStaNo.setLocType1(param.getLocType1());
+// sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -295,7 +242,8 @@
if (locMast.getRow1()<2){
//1.鎵爜涓婃姤
CombParam combParam = new CombParam();
- combParam.setPackNo(wrkMast.getBarcode());
+ combParam.setPackNo(waitPakins.get(0).getMatnr());
+ combParam.setBarcode(wrkMast.getBarcode());
combParam.setLocNo(wrkMast.getLocNo());
combParam.setPackSts(0);
combParam.setStepSts(1);
--
Gitblit v1.9.1