Browse Source

opt:修改正式环境相关

test-20240527
gongbx 7 months ago
parent
commit
bbaa721b9d
  1. 8
      nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillDetailMapper.xml
  2. 4
      nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/EasOutInBillMapper.xml
  3. 2
      nlsso-server/src/main/resources/config/application-dev.yml
  4. 4
      nlsso-server/src/main/resources/config/application.yml

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

@ -5,15 +5,15 @@
SELECT
*
FROM
MEIAMSYSTEM.V_UC_OUTINBILL
EAS_NOBLE.V_UC_OUTINBILL
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 id="selectSrmPageWithInventory" resultType="org.nl.wms.database.eas.dao.EasOutInBillDetail">
SELECT
*
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 id="selectByConditions" resultType="org.nl.wms.database.eas.dao.InventoryInfo">
SELECT
@ -24,7 +24,7 @@
lot as pc,
curstoreqty as kcsl ,
trackno
FROM MEIAMSYSTEM.V_UC_INVENTORYINFO
FROM EAS_NOBLE.V_UC_INVENTORYINFO
<where>
<if test="zzbmList != null and zzbmList.size() > 0">
AND stono IN

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

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

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

@ -11,7 +11,7 @@ spring:
mysql:
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
username: ${DB_USER:generallu}
username: ${DB_USER:root}
password: ${DB_PWD:123456}
type: com.alibaba.druid.pool.DruidDataSource
mysql_srm:

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

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

Loading…
Cancel
Save