From 69414cd2a7f04b4f31d152b51876f3b559b43a3a Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 09 四月 2025 08:03:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/task/CheckDeepScheduler.java | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 8 --------
src/main/java/com/zy/asrs/task/StandingScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/FireOutScheduler.java | 2 +-
6 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4eb8581..4f09e0e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +34,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -231,6 +236,22 @@
// map.put("isComplete", true);
return R.ok();
}
+ @PostMapping("/rpc/packStatus")
+// @AppAuth(memo = "PACK淇℃伅涓嬪彂")
+ public synchronized R packStatus(@RequestBody(required = false) CombParam param) {
+ log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤={}",param);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", param.getChannel()));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("娌℃湁鎵惧埌璇ラ�氶亾----"+param.getChannel());
+ }
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
+ locMast.setPackStatus(param.getPackSts());
+ locMast.setModiTime(new Date());
+ return R.ok();
+ }
// @PostMapping("/rpc/pakOut/auth/v1")
// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 04fc872..f06b641 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -35,6 +35,8 @@
// 搴撲綅缂栧彿
private String locNo;
+ private Integer channel;
+
private List<CombMat> combMats;
@Data
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
index db1adb8..4eb0495 100644
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
@@ -46,7 +46,7 @@
/**
* 灏嗕袱涓繁搴撲綅鍚堝苟涓烘繁娴呭簱浣�,鐗╂枡鍙风浉鍚岋紝婧愬簱浣嶅叆搴撴棩鏈熸棭浜庣洰鏍囧簱浣嶅搴旀繁搴撲綅鍏ュ簱鏃ユ湡锛屽簱浣嶇姸鎬侀兘涓篎
*/
- @Scheduled(cron = "0/30 * * * * ?")
+// @Scheduled(cron = "0/30 * * * * ?")
private void execute() throws ParseException {
if (!confirmDeep) return;
diff --git a/src/main/java/com/zy/asrs/task/FireOutScheduler.java b/src/main/java/com/zy/asrs/task/FireOutScheduler.java
index e8301f0..e5596c1 100644
--- a/src/main/java/com/zy/asrs/task/FireOutScheduler.java
+++ b/src/main/java/com/zy/asrs/task/FireOutScheduler.java
@@ -19,7 +19,7 @@
/**
*
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute()
{
//if (!confirmDeep) return;
diff --git a/src/main/java/com/zy/asrs/task/StandingScheduler.java b/src/main/java/com/zy/asrs/task/StandingScheduler.java
index e038dda..d6a4a37 100644
--- a/src/main/java/com/zy/asrs/task/StandingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/StandingScheduler.java
@@ -20,7 +20,7 @@
/**
*
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
private void execute() {
//if (confirmDeep) return;
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6c5a1ae..cb82577 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -194,14 +194,6 @@
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());
testMast.setChannel(locMast.getChannel());
--
Gitblit v1.9.1