From 45e4ef2ecf62e32c243d72529f430c9b4f151b6b Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 05 十一月 2024 09:55:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/controller/OpenController.java | 27 ++++++++++++++++++---------
src/main/java/com/zy/asrs/task/AutoGroupingScheduler.java | 5 +++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5576b9c..6cd9a4f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -9,6 +9,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,12 +36,15 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ConfigService configService;
+
@Deprecated
@PostMapping("/grouping")
@AppAuth(memo = "AGV缁勬墭璋冪敤")
public synchronized R grouping(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) AgvGroupingParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) AgvGroupingParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param.getOrderNo())) {
param.setOrderNo(param.getBillNo());
@@ -57,14 +62,14 @@
@PostMapping("/barcodeVerificatio")
@AppAuth(memo = "AGV璋冪敤鏍￠獙鏉＄爜")
public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String,String> param,
- HttpServletRequest request){
+ @RequestBody(required = false) Map<String, String> param,
+ HttpServletRequest request) {
auth(appkey, param, request);
// 鎵樼洏鏉＄爜
String barcode = param.get("barcode");
if (Cools.isEmpty(barcode)) {
- return R.parse("鏉＄爜涓嶈兘涓虹┖");
+ return R.parse("鏉＄爜涓嶈兘涓虹┖");
}
return openService.barcodeVerificatio(barcode);
@@ -73,10 +78,14 @@
@PostMapping("/outbound")
@AppAuth(memo = "MES璋冪敤鍑哄簱")
public synchronized R outbound(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OutBoundParam param,
- HttpServletRequest request) {
+ @RequestBody(required = false) OutBoundParam param,
+ HttpServletRequest request) {
+ Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND");
+ if (mesAuto != null && mesAuto.getValue().equals("1")) {
+ return R.parse("鍏抽棴鑷姩鍑哄簱");
+ }
auth(appkey, param, request);
- if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
+ if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) {
return R.parse(BaseRes.PARAM);
}
@@ -87,7 +96,7 @@
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/asrs/task/AutoGroupingScheduler.java b/src/main/java/com/zy/asrs/task/AutoGroupingScheduler.java
index 94c4812..3166d50 100644
--- a/src/main/java/com/zy/asrs/task/AutoGroupingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoGroupingScheduler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task;
+import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.task.handler.AutoGroupingHandler;
@@ -33,6 +34,10 @@
List<Order> orderList = orderMapper.selectNotGroupingList();
for (Order order : orderList) {
+ //璺宠繃娌℃湁鎵樼洏鐮佺殑鍗曟嵁
+ if (Cools.isEmpty(order.getTemp2())) {
+ continue;
+ }
autoGroupingHandler.autoGrouping(order);
}
--
Gitblit v1.9.1