From fe1bfbf474f9af9a75a987e2c90a92c30d8601c9 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 18 七月 2025 12:40:44 +0800
Subject: [PATCH] #连续出库wms配置
---
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 5 ++++-
src/main/java/com/zy/system/mapper/ConfigMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 ++++++++++++++++++++++----
src/main/java/com/zy/system/service/ConfigService.java | 2 +-
src/main/java/com/zy/asrs/service/ConfigService.java | 9 +++++++++
src/main/resources/mapper/ConfigMapper.xml | 5 +++++
6 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/ConfigService.java b/src/main/java/com/zy/asrs/service/ConfigService.java
new file mode 100644
index 0000000..fecd1ea
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/ConfigService.java
@@ -0,0 +1,9 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.system.entity.Config;
+
+public interface ConfigService extends IService<Config> {
+
+ Config selectConfigByCode(String code);
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f6ad5ad..4620d9a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
+import com.zy.system.service.*;
import com.zy.asrs.utils.RouteUtils;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -38,6 +39,9 @@
import com.zy.core.thread.LedThread;
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
+import com.zy.system.entity.Config;
+import com.zy.system.mapper.ConfigMapper;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -94,6 +98,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasRgvMapService basRgvMapService;
+ @Autowired
+ private ConfigService configService;
@Value("${wms.url}")
private String wmsUrl;
@@ -101,6 +107,8 @@
private boolean isToOrigin;
public Integer wrkNo = 10000;
+ @Autowired
+ private ConfigMapper configMapper;
/**
* 缁勬墭
@@ -1212,11 +1220,21 @@
break;
// continue;
}
-// && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
-// && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()
+ boolean canOut;
+ Config config = configService.selectConfigByCode("C-OUT-OP");
+
+ if (Cools.isEmpty(config) || config.getValue().equals("false") ){
+ canOut = staProtocol.isAutoing()
+ && !staProtocol.isLoading()
+ && "Y".equals(staDetl.getCanouting())
+ && staProtocol.getWorkNo() == 0
+ && staProtocol.isOutEnable();
+ } else {
+ canOut = staProtocol.isAutoing();
+ }
+
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
- && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ if (canOut) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index 9ec6ab3..b309d30 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.system.entity.Config;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ConfigMapper extends BaseMapper<Config> {
+ Config selectConfigByCode(@Param("code") String code);
}
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 7e31e9a..918e5fa 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -4,5 +4,5 @@
import com.zy.system.entity.Config;
public interface ConfigService extends IService<Config> {
-
+ Config selectConfigByCode(String code);
}
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 0a8661c..3fe5200 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -8,5 +8,8 @@
@Service("configService")
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
-
+ @Override
+ public Config selectConfigByCode(String code){
+ return this.baseMapper.selectConfigByCode(code);
+ };
}
diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml
index 8673fe5..a236137 100644
--- a/src/main/resources/mapper/ConfigMapper.xml
+++ b/src/main/resources/mapper/ConfigMapper.xml
@@ -12,5 +12,10 @@
<result column="status" property="status" />
</resultMap>
+ <select id="selectConfigByCode" resultMap="BaseResultMap">
+ select top 1 * from sys_config
+ where 1=1
+ and code=#{code}
+ </select>
</mapper>
--
Gitblit v1.9.1