root/nl_sanqi_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:修改正式环境相关

Browse Source
This commit is contained in:
gongbx
2024-04-28 10:51:04 +08:00
parent 52e85594aa
commit bbaa721b9d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
View File

@@ -5,15 +5,15 @@
SELECT SELECT
* *
FROM FROM
MEIAMSYSTEM.V_UC_OUTINBILL EAS_NOBLE.V_UC_OUTINBILL
WHERE DJZT = '提交' WHERE DJZT = '提交'
AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '2' DAY(3) AND TO_DATE(cjsj, 'YYYY-MM-DD') >= TRUNC(SYSDATE) - INTERVAL '90' DAY(3)
</select> </select>
<select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT SELECT
* *
FROM V_WMS_INBILL_THIRD FROM V_WMS_INBILL_THIRD
WHERE DJZT='未入库' AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 2 DAY) WHERE DJZT='未入库' AND CJSJ >= DATE_SUB(CURDATE(), INTERVAL 90 DAY)
</select> </select>
<select id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo"> <select id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo">
SELECT SELECT
@@ -24,7 +24,7 @@
lot as pc, lot as pc,
curstoreqty as kcsl , curstoreqty as kcsl ,
trackno trackno
FROM MEIAMSYSTEM.V_UC_INVENTORYINFO FROM EAS_NOBLE.V_UC_INVENTORYINFO
<where> <where>
<if test="zzbmList != null and zzbmList.size() > 0"> <if test="zzbmList != null and zzbmList.size() > 0">
AND stono IN AND stono IN

4
nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
View File

@@ -5,7 +5,7 @@
<select id="getEasBills" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="getEasBills" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT * SELECT *
FROM MEIAMSYSTEM.V_UC_OUTINBILL FROM EAS_NOBLE.V_UC_OUTINBILL
WHERE WHERE
djzt = '提交' djzt = '提交'
</select> </select>
@@ -26,7 +26,7 @@
</select> </select>
<select id="getSrmBills" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail"> <select id="getSrmBills" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT * SELECT *
FROM MEIAMSYSTEM.V_UC_OUTINBILL FROM EAS_NOBLE.V_UC_OUTINBILL
WHERE WHERE
djzt = '提交' djzt = '提交'
</select> </select>

2
nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -11,7 +11,7 @@ spring:
mysql: mysql:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:generallu} username: ${DB_USER:root}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
mysql_srm: mysql_srm:

4
nlsso-server/src/main/resources/config/application.yml
View File

@@ -4,7 +4,7 @@ server:
relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118 relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118
spring: spring:
profiles: profiles:
active: devLocal active: prod
datasource: datasource:
druid: druid:
initial-size: 5 #初始化时建立物理连接的个数 initial-size: 5 #初始化时建立物理连接的个数
@@ -198,7 +198,7 @@ jetcache:
# datacenter: orcl # datacenter: orcl
# wsdlService: WSNLMESFacade # wsdlService: WSNLMESFacade
# operationName: dealTask # operationName: dealTask
# dataType: MEIAMSYSTEM # dataType: EAS_NOBLE
# deleteTask: 86400000 # deleteTask: 86400000
#srmConfig: #srmConfig:
# host: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck # host: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck