From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
ruoyi-admin-ztns/src/main/resources/application-druid.yml | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin-ztns/src/main/resources/application-druid.yml b/ruoyi-admin-ztns/src/main/resources/application-druid.yml
index c79dc4e..9ddd314 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-druid.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-druid.yml
@@ -131,7 +131,8 @@
oa:
oaHost:
prodIp:
- unqualifiedProcessId:
+ unqualifiedProcessId: 1
+ unqualifiedProcessIdByKJNS: 2 #KJNS鍩烵A娴佺▼id
# 浜轰簨绯荤粺
personnel:
@@ -153,18 +154,36 @@
examiningUrl: # https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
ifs:
- contract: ZTNS
- contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
- contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
- custorder: http://192.168.20.47/PurchService.ashx?
- custorder-port: http://192.168.20.47:8008/PurchService.ashx?
- erp-services: http://192.168.20.47:8081
+ props:
+ - contract: ZTNS #涓ぉ鑰愪笣鍩�
+ contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= #get璇锋眰瀵嗛挜
+ contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo= #post璇锋眰瀵嗛挜
+ custorder: http://192.168.20.47/PurchService.ashx? #get璇锋眰鍦板潃
+ custorder-port: http://192.168.20.47:8008/PurchService.ashx? #post璇锋眰鍦板潃
+ erp-services: http://192.168.20.47:8081 #erp璇锋眰鍦板潃
+ tobe-inspected-location: 1302 #寰呮搴撲綅
+ raw-qualified-location: 1301 #鍘熸潗鏂欏悎鏍煎簱浣�
+ product-qualified-location: CP-02-001 #鎴愬搧鍚堟牸搴撲綅
+ - contract: KJNS #绉戞妧鑰愪笣鍩�
+ contract-key-get: ueWGmvzoc4iR0y%2FsP6iOMeYn3ohC45KTCl3dZ94WaNk%3D #get璇锋眰瀵嗛挜
+ contract-key-post: ueWGmvzoc4iR0y/sP6iOMeYn3ohC45KTCl3dZ94WaNk= #post璇锋眰瀵嗛挜
+ custorder: http://192.168.47.50/PurchService.ashx? #get璇锋眰鍦板潃
+ custorder-port: http://192.168.20.47:8008/PurchService.ashx? #post璇锋眰鍦板潃
+ erp-services: http://192.168.20.47:8081 #erp璇锋眰鍦板潃
+ tobe-inspected-location: A101 #寰呮搴撲綅
+ raw-qualified-location: A201 #鍘熸潗鏂欏悎鏍煎簱浣�
+ product-qualified-location: C101 #鎴愬搧鍚堟牸搴撲綅
mes:
- ztns:
- ip: http://10.16.173.36
- user: lims
- password: qCzOMJlqE8TYOHDWGva/Tw==
+ props:
+ - contract: ZTNS
+ ip: http://10.16.173.36
+ user: lims
+ password: qCzOMJlqE8TYOHDWGva/Tw==
+ - contract: KJNS
+ ip: http://10.1.203.177
+ user: lims
+ password: qCzOMJlqE8TYOHDWGva/Tw==
# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
mqtt:
--
Gitblit v1.9.3