From 144d50c5ba277ba9df9613d3510655db314358f7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:26:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 6 -
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 12 +-
src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java | 46 -----------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 6 -
src/main/resources/application-dev.yml | 53 +------------
src/main/resources/application-prod.yml | 44 -----------
src/main/java/com/zy/asrs/service/BasContainerService.java | 8 -
src/main/java/com/zy/asrs/controller/BasContainerController.java | 9 --
src/main/resources/application.yml | 3
9 files changed, 17 insertions(+), 170 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasContainerController.java b/src/main/java/com/zy/asrs/controller/BasContainerController.java
index 74d91ec..b6754ae 100644
--- a/src/main/java/com/zy/asrs/controller/BasContainerController.java
+++ b/src/main/java/com/zy/asrs/controller/BasContainerController.java
@@ -67,14 +67,7 @@
return R.ok();
}
- @RequestMapping(value = "/basContainer/init/auth")
- @ManagerAuth
- public R init(@RequestBody ContainerParams container) {
- if (Objects.isNull(container)) {
- throw new RuntimeException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
- }
- return basContainerService.init(container);
- }
+
@RequestMapping(value = "/basContainer/update/auth")
diff --git a/src/main/java/com/zy/asrs/service/BasContainerService.java b/src/main/java/com/zy/asrs/service/BasContainerService.java
index ad2f9af..a60a428 100644
--- a/src/main/java/com/zy/asrs/service/BasContainerService.java
+++ b/src/main/java/com/zy/asrs/service/BasContainerService.java
@@ -7,11 +7,5 @@
public interface BasContainerService extends IService<BasContainer> {
- /**
- * @author Ryan
- * @date 2025/9/26
- * @description: TODO
- * @version 1.0
- */
- R init(ContainerParams container);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
index 3919e27..d728f76 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
@@ -10,7 +10,6 @@
import com.zy.asrs.entity.BasContainer;
import com.zy.asrs.service.BasContainerService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.apache.tika.utils.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,49 +22,4 @@
@Service("basContainerService")
public class BasContainerServiceImpl extends ServiceImpl<BasContainerMapper, BasContainer> implements BasContainerService {
- /**
- * @author Ryan
- * @date 2025/9/26
- * @description: 瀹瑰櫒鍒濆鍖�
- * @version 1.0
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public R init(ContainerParams container) {
- Integer length = 7;
- if (Objects.isNull(container.getType())) {
- throw new CoolException("瀹瑰櫒绫诲瀷涓嶈兘涓虹┖锛�");
- }
- if (!Objects.isNull(container.getLength())) {
- length = container.getLength();
- }
- if (!Objects.isNull(container.getFlagInit()) && container.getFlagInit().equals(CommonEnum.COMMON_ENUM_Y.type)) {
- this.delete(new EntityWrapper<>());
- }
- for (int i = container.getStart(); i <= container.getEnd(); i++) {
- BasContainer basContainer = new BasContainer();
- String prefix = "", ruleCode = "";
- if (container.getType().equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
- prefix = "LX2";
- basContainer.setMixMax(3);
- } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
- prefix = "LK3";
- basContainer.setMixMax(2);
- } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
- prefix = "TP4";
- basContainer.setMixMax(2);
- }
- ruleCode = prefix + StringUtils.leftPad(i + "", length, "0");
- basContainer.setType(container.getType())
- .setCreateTime(new Date())
- .setUpdateTime(new Date())
- .setId(null)
- .setFlagMix(1)
- .setBarcode(ruleCode);
- if (!this.insert(basContainer)) {
- throw new CoolException("瀹瑰櫒淇濆瓨澶辫触锛侊紒");
- }
- }
- return R.ok();
- }
}
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 342da36..935343e 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -28,12 +28,12 @@
@Component
public class LocMoveAllScheduler {
- @Value("${loc-move.enable}")
- private boolean enable;
- @Value("${loc-move.crn1}")
- private boolean crn1;
- @Value("${loc-move.crn2}")
- private boolean crn2;
+ //@Value("${loc-move.enable}")
+ private boolean enable =false;
+ //@Value("${loc-move.crn1}")
+ private boolean crn1=false;
+ //@Value("${loc-move.crn2}")
+ private boolean crn2=false;
@Autowired
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index ef69df3..bad7062 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -31,8 +31,6 @@
@Autowired
private ApiLogService apiLogService;
- @Value("${erp.switch.ErpReportOld}")
- private boolean ErpReportOld;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -104,9 +102,7 @@
// @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
- if (!ErpReportOld){
- return;
- }
+
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 6da3dde..c60f310 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -103,10 +103,6 @@
}
- @RequestMapping(value = "/activate")
- public R activate() {
- licenseTimer.timer();
- return R.ok();
- }
+
}
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cd52cb2..e9c3c80 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -11,8 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
- password: Skyouc#23
- url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms
+ password: sa@123
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms2.0
mvc:
static-path-pattern: /**
redis:
@@ -35,12 +35,9 @@
cache-enabled: true
call-setters-on-nulls: true
-logging:
- file:
- path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: asrs2023
+ pwd: xltys1995
swagger:
enable: false
@@ -65,48 +62,6 @@
doubleLocsLeft: 1,5,9,13
# 鍙虫繁搴撲綅鎺掑彿
doubleLocsRight: 4,8,12,16
-# wms鍙傛暟閰嶇疆
-wms-parameter:
- # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
- automaticFillingBoardStaNosBoolean: false
- # 鑷姩琛ョ┖鏉跨珯鐐�
- automaticFillingBoardStaNos: 112,101
- # 鑷姩绉诲簱鍔熻兘寮�鍏�
- autoLocMoveBoolean: false
- # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
- autoLocMoveUnilateralBoolean: false
-comb:
- limit: 5000
-#erp瀵规帴
-erp:
- # 寮�鍏�
- switch:
- #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
- ErpReportOld: false
- #鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: false
- #鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: false
- #涓婃姤銆佸鏍稿崟鎹紑鍏�
- ReviewOrderSwitch: false
- # 鍦板潃
- address:
- URL: http://58.210.10.90:28090
- #鐧诲綍鍦板潃
- loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
- #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
- #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
- outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
- #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
- outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
- #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
- outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
- # 鐧诲綍璐﹀彿绠＄悊
- login :
- acctID: "647e849ab6fa0f"
- username: "llw"
- password: "666666"
- lcid: 2052
\ No newline at end of file
+
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 890bdc6..fd9d3f3 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -78,48 +78,4 @@
doubleLocsLeft: 1,5,9,13
# 鍙虫繁搴撲綅鎺掑彿
doubleLocsRight: 4,8,12,16
-# wms鍙傛暟閰嶇疆
-wms-parameter:
- # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
- automaticFillingBoardStaNosBoolean: false
- # 鑷姩琛ョ┖鏉跨珯鐐�
- automaticFillingBoardStaNos: 112,101
- # 鑷姩绉诲簱鍔熻兘寮�鍏�
- autoLocMoveBoolean: false
- # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
- autoLocMoveUnilateralBoolean: false
-comb:
- limit: 5000
-
-#erp瀵规帴
-erp:
- # 寮�鍏�
- switch:
- #璁℃椂鍣ㄤ笂鎶ュ紑鍏�
- ErpReportOld: false
- #鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: false
- #鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: false
- #涓婃姤銆佸鏍稿崟鎹紑鍏�
- ReviewOrderSwitch: false
- # 鍦板潃
- address:
- URL: http://58.210.10.90:28090
- #鐧诲綍鍦板潃
- loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
- #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
- #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
- outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
- #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧�
- outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
- #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
- outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
- # 鐧诲綍璐﹀彿绠＄悊
- login :
- acctID: "647e849ab6fa0f"
- username: "llw"
- password: "666666"
- lcid: 2052
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3d7808a..993ee9d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,6 @@
spring:
profiles:
active: dev
+logging:
+ file:
+ path: /stock/out/@pom.build.finalName@/logs
\ No newline at end of file
--
Gitblit v1.9.1