From d2a5ef4694be0ffb37a358ccf53f6d6cd3ef93f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 28 十月 2025 17:14:47 +0800
Subject: [PATCH] 添加的分属环境配置文件 暂停上报功能
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4
src/main/resources/application-dev.yml | 112 ++++++++++++++++
src/main/resources/application-prod.yml | 125 +++++++++++++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 16 +-
src/main/resources/application.yml | 126 -----------------
5 files changed, 249 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index a797915..ef69df3 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -81,7 +81,7 @@
// }
}
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil() {
// String erpReport = Parameter.get().getErpReport();
@@ -101,7 +101,7 @@
// }
}
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
if (!ErpReportOld){
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..ffa0b84
--- /dev/null
+++ b/src/main/resources/application-dev.yml
@@ -0,0 +1,112 @@
+server:
+ port: 8080
+ servlet:
+ context-path: /@pom.build.finalName@
+
+spring:
+ application:
+ name: @pom.build.finalName@
+ jmx:
+ enabled: false
+ datasource:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ username: sa
+ password: Skyouc#23
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ mvc:
+ static-path-pattern: /**
+ redis:
+ host: localhost
+ port: 6379
+ database: 0
+ # password: xltys1995
+ servlet:
+ multipart:
+ maxFileSize: 100MB
+ maxRequestSize: 100MB
+
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+ # global-config:
+ # field-strategy: 0
+ configuration:
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ map-underscore-to-camel-case: true
+ cache-enabled: true
+ call-setters-on-nulls: true
+
+logging:
+ file:
+ path: /stock/out/@pom.build.finalName@/logs
+
+super:
+ pwd: asrs2023
+
+swagger:
+ enable: false
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: integrationasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 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-prod.yml b/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..890bdc6
--- /dev/null
+++ b/src/main/resources/application-prod.yml
@@ -0,0 +1,125 @@
+server:
+ port: 8080
+ servlet:
+ context-path: /@pom.build.finalName@
+
+spring:
+ application:
+ name: @pom.build.finalName@
+ jmx:
+ enabled: false
+ datasource:
+ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=source
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
+# username: sa
+# password: Zoneyung@zy56$
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
+# username: sa
+# password: sa@123
+# url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
+ username: sa
+ password: Skyouc#23
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ mvc:
+ static-path-pattern: /**
+ redis:
+ host: localhost
+ port: 6379
+ database: 0
+# password: xltys1995
+ servlet:
+ multipart:
+ maxFileSize: 100MB
+ maxRequestSize: 100MB
+
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+ # global-config:
+ # field-strategy: 0
+ configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ map-underscore-to-camel-case: true
+ cache-enabled: true
+ call-setters-on-nulls: true
+
+logging:
+ file:
+ path: /stock/out/@pom.build.finalName@/logs
+
+super:
+ pwd: asrs2023
+
+swagger:
+ enable: false
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: integrationasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
+
+# 涓嬩綅鏈洪厤缃�
+wcs-slave:
+ # 鍙屾繁
+ doubleDeep: true
+ # 鍙屾繁搴撲綅鎺掑彿
+ doubleLocs: 1,4,5,8,9,12,13,16
+ # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+ groupCount: 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 890bdc6..3d7808a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,125 +1,3 @@
-server:
- port: 8080
- servlet:
- context-path: /@pom.build.finalName@
-
spring:
- application:
- name: @pom.build.finalName@
- jmx:
- enabled: false
- datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
-# username: sa
-# password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=source
-# username: sa
-# password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
-# username: sa
-# password: Zoneyung@zy56$
-# url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
-# username: sa
-# password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:62316;databasename=source
- username: sa
- password: Skyouc#23
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
- mvc:
- static-path-pattern: /**
- redis:
- host: localhost
- port: 6379
- database: 0
-# password: xltys1995
- servlet:
- multipart:
- maxFileSize: 100MB
- maxRequestSize: 100MB
-
-mybatis-plus:
- mapper-locations: classpath:mapper/*.xml
- # global-config:
- # field-strategy: 0
- configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- map-underscore-to-camel-case: true
- cache-enabled: true
- call-setters-on-nulls: true
-
-logging:
- file:
- path: /stock/out/@pom.build.finalName@/logs
-
-super:
- pwd: asrs2023
-
-swagger:
- enable: false
-
-#License鐩稿叧閰嶇疆
-license:
- subject: integrationasrs
- publicAlias: publicCert
- storePass: public_zhongyang_123456789
- licensePath: license.lic
- publicKeysStorePath: publicCerts.keystore
-
-# 涓嬩綅鏈洪厤缃�
-wcs-slave:
- # 鍙屾繁
- doubleDeep: true
- # 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
- # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 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
+ profiles:
+ active: dev
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 952db23..b367be3 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -20,23 +20,23 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 95}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 170}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width: 120}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width: 140}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'taskType$', align: 'center',title: '浠诲姟绫诲瀷'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', width: 120}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', width: 120}
+ ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', width: 120}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1