From d329ed0921a5c8d638cbb0071434de8880c400fe Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 19 Nov 2024 18:18:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B3=E6=AD=A6=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 ++ spy.log | 77 +++++++ .../mipsdl/client/scpwxyy/ScpwxyyClient.java | 191 ++++++++++-------- .../glxp/mipsdl/req/base/ListPageRequest.java | 20 +- .../req/base/UdiwmsOrderQueryRequest.java | 2 + .../UdiwmsQueryUdiInvProductsRequest.java | 2 + .../mipsdl/req/base/UdiwmsUnitRequest.java | 1 + .../req/base/UdiwmsWarehouseRequest.java | 1 + .../mipsdl/res/scwpxyy/A006headRespone.java | 54 +++++ .../mipsdl/service/scpwxyy/A001Service.java | 19 +- .../mipsdl/service/scpwxyy/A004Service.java | 19 ++ .../service/scpwxyy/A006headService.java | 35 +++- .../mipsdl/service/scpwxyy/A007Service.java | 7 + .../mipsdl/thirddao/scpwxyy/A001Mapper.java | 4 + .../mipsdl/thirddao/scpwxyy/A004Mapper.java | 4 + .../thirddao/scpwxyy/A006headMapper.java | 6 +- src/main/resources/application-dev.yml | 32 --- src/main/resources/application-pro.yml | 25 +-- .../mapper/other/scpwxyy/A001Mapper.xml | 79 ++++++-- .../mapper/other/scpwxyy/A004Mapper.xml | 19 ++ .../mapper/other/scpwxyy/A006headMapper.xml | 100 ++++++--- 21 files changed, 527 insertions(+), 190 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/res/scwpxyy/A006headRespone.java diff --git a/pom.xml b/pom.xml index ebffb18..28862af 100644 --- a/pom.xml +++ b/pom.xml @@ -185,6 +185,26 @@ 5.10.0 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.2 + + + + org.mybatis + mybatis + + + org.mybatis + mybatis-spring + + + diff --git a/spy.log b/spy.log index b446eb5..f1a2965 100644 --- a/spy.log +++ b/spy.log @@ -53871,3 +53871,80 @@ 1731294545561|0|statement|connection 200|url jdbc:p6spy:mysql://127.0.0.1:3306/udiwma81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 1731294599561|6|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udiwma81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') 1731294599592|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udiwma81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731998427240|9|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731998427263|5|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731998483522|5|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731998483564|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731998562052|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,thirdId,thirdName,apikey,secretkey,mainSys,enabled,thridUrl,thirdSysUrl,guideUrl,remark FROM thr_system WHERE (thirdId = ?)|SELECT id,thirdId,thirdName,apikey,secretkey,mainSys,enabled,thridUrl,thirdSysUrl,guideUrl,remark FROM thr_system WHERE (thirdId = 'thirdId') +1731998562063|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,thirdId,thirdName,apikey,secretkey,mainSys,enabled,thridUrl,thirdSysUrl,guideUrl,remark FROM thr_system WHERE (thirdId = ?)|SELECT id,thirdId,thirdName,apikey,secretkey,mainSys,enabled,thridUrl,thirdSysUrl,guideUrl,remark FROM thr_system WHERE (thirdId = 'thirdId') +1731998583157|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731998583162|0|commit|connection 5|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731998583188|24|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( 'http://192.168.6.214:8088/api/SendRequest/CAllInterface', 'postJson', '{"msgBody":"{\"unitType\":\"2\"}","msgHeader":"getMaterialUnit"}', '{"code":500,"data":{},"message":"网络错误，或远程服务器无法异常，无法连接！"}', '2024-11-19T14:42:42.053+0800', 'third', 0, 21097 ) +1731998583188|24|statement|connection 5|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{}', '{"code":500,"data":{},"message":"网络错误，或远程服务器无法异常，无法连接！"}', '2024-11-19T14:42:42.025+0800', 'interface', 1, 21116 ) +1731998605076|5|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731998605114|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731998660397|3|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731998660457|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731998669902|1|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT unitid,name,lastupdatetime,addr,creditno,spell,contact,mobile FROM a001|SELECT unitid,name,lastupdatetime,addr,creditno,spell,contact,mobile FROM a001 +1731998669930|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731998669938|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{}', '{"code":20000,"data":[{"lastupdatetime":1609430400000,"name":"平武县人民医院","spell":"pwxrmyy","unitid":"451253699"}],"message":"success"}', '2024-11-19T14:44:29.870+0800', 'interface', 1, 32 ) +1731999228868|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1731999228905|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731999244377|1|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a001 order by LASTUPDATETIME|select * from a001 order by LASTUPDATETIME +1731999244403|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731999244410|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{}', '{"code":20000,"data":[{"lastupdatetime":1609430400000,"name":"平武县人民医院","spell":"pwxrmyy","unitid":"451253699"}],"message":"success"}', '2024-11-19T14:54:04.346+0800', 'interface', 1, 30 ) +1731999267865|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a001 WHERE NAME like concat('%', ?, '%') order by LASTUPDATETIME|select * from a001 WHERE NAME like concat('%', '1', '%') order by LASTUPDATETIME +1731999267867|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731999267871|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{"name":"1"}', '{"code":20000,"data":[],"message":"success"}', '2024-11-19T14:54:27.864+0800', 'interface', 1, 2 ) +1731999286859|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a001 WHERE ( UNITID like concat('%', ?, '%') OR NAME like concat('%', ?, '%') OR ADDR like concat('%', ?, '%') OR CREDITNO like concat('%', ?, '%') OR SPELL like concat('%', ?, '%') OR CONTACT like concat('%', ?, '%') OR MOBILE like concat('%', ?, '%') ) order by LASTUPDATETIME|select * from a001 WHERE ( UNITID like concat('%', '1', '%') OR NAME like concat('%', '1', '%') OR ADDR like concat('%', '1', '%') OR CREDITNO like concat('%', '1', '%') OR SPELL like concat('%', '1', '%') OR CONTACT like concat('%', '1', '%') OR MOBILE like concat('%', '1', '%') ) order by LASTUPDATETIME +1731999286861|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731999286864|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{"key":"1"}', '{"code":20000,"data":[{"lastupdatetime":1609430400000,"name":"平武县人民医院","spell":"pwxrmyy","unitid":"451253699"}],"message":"success"}', '2024-11-19T14:54:46.857+0800', 'interface', 1, 3 ) +1731999299005|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a001 WHERE ( UNITID like concat('%', ?, '%') OR NAME like concat('%', ?, '%') OR ADDR like concat('%', ?, '%') OR CREDITNO like concat('%', ?, '%') OR SPELL like concat('%', ?, '%') OR CONTACT like concat('%', ?, '%') OR MOBILE like concat('%', ?, '%') ) order by LASTUPDATETIME|select * from a001 WHERE ( UNITID like concat('%', '451253699', '%') OR NAME like concat('%', '451253699', '%') OR ADDR like concat('%', '451253699', '%') OR CREDITNO like concat('%', '451253699', '%') OR SPELL like concat('%', '451253699', '%') OR CONTACT like concat('%', '451253699', '%') OR MOBILE like concat('%', '451253699', '%') ) order by LASTUPDATETIME +1731999299007|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731999299010|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{"key":"451253699"}', '{"code":20000,"data":[{"lastupdatetime":1609430400000,"name":"平武县人民医院","spell":"pwxrmyy","unitid":"451253699"}],"message":"success"}', '2024-11-19T14:54:59.003+0800', 'interface', 1, 3 ) +1731999323369|1|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a001 WHERE ( UNITID like concat('%', ?, '%') OR NAME like concat('%', ?, '%') OR ADDR like concat('%', ?, '%') OR CREDITNO like concat('%', ?, '%') OR SPELL like concat('%', ?, '%') OR CONTACT like concat('%', ?, '%') OR MOBILE like concat('%', ?, '%') ) order by LASTUPDATETIME|select * from a001 WHERE ( UNITID like concat('%', '451253699', '%') OR NAME like concat('%', '451253699', '%') OR ADDR like concat('%', '451253699', '%') OR CREDITNO like concat('%', '451253699', '%') OR SPELL like concat('%', '451253699', '%') OR CONTACT like concat('%', '451253699', '%') OR MOBILE like concat('%', '451253699', '%') ) order by LASTUPDATETIME +1731999323370|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1731999323373|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getUnits', 'POST', '{"key":"451253699"}', '{"code":20000,"data":[{"lastupdatetime":1609430400000,"name":"平武县人民医院","spell":"pwxrmyy","unitid":"451253699"}],"message":"success"}', '2024-11-19T14:55:23.366+0800', 'interface', 1, 4 ) +1731999853721|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1731999853736|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732000139691|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732000139708|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732000169871|5|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a004 order by LASTUPDATETIME|select * from a004 order by LASTUPDATETIME +1732000169897|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732000169905|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getWarehouse', 'POST', '{"inventoryCode":""}', 'null', '2024-11-19T15:09:29.837+0800', 'interface', 1, 34 ) +1732000190227|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a004 order by LASTUPDATETIME|select * from a004 order by LASTUPDATETIME +1732000190230|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732000190233|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getWarehouse', 'POST', '{"inventoryCode":""}', 'null', '2024-11-19T15:09:50.225+0800', 'interface', 1, 4 ) +1732000207762|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732000207798|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732000285717|2|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a004 order by CODE|select * from a004 order by CODE +1732000285759|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732000285792|3|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getWarehouse', 'POST', '{"inventoryCode":""}', '{"code":20000,"data":[{"code":"10011","name":"药剂科"}],"message":"success"}', '2024-11-19T15:11:25.665+0800', 'interface', 1, 51 ) +1732000294661|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a004 WHERE ( CODE like concat('%', ?, '%') ) order by CODE|select * from a004 WHERE ( CODE like concat('%', '10012', '%') ) order by CODE +1732000294662|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732000294666|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getWarehouse', 'POST', '{"inventoryCode":"10012"}', '{"code":20000,"data":[],"message":"success"}', '2024-11-19T15:11:34.659+0800', 'interface', 1, 2 ) +1732000298262|0|statement|connection 4|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a004 WHERE ( CODE like concat('%', ?, '%') ) order by CODE|select * from a004 WHERE ( CODE like concat('%', '10011', '%') ) order by CODE +1732000298264|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732000298268|1|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getWarehouse', 'POST', '{"inventoryCode":"10011"}', '{"code":20000,"data":[{"code":"10011","name":"药剂科"}],"message":"success"}', '2024-11-19T15:11:38.261+0800', 'interface', 1, 3 ) +1732000482506|5|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732000482522|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732000501003|0|statement|connection 22|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732000501008|0|statement|connection 22|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732006365840|5|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732006365855|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732006396304|5|statement|connection 1|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a006head order by CODE|select * from a006head order by CODE +1732006396326|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732006396336|3|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getOrders', 'POST', '{}', 'null', '2024-11-19T16:53:16.262+0800', 'interface', 1, 37 ) +1732006431070|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732006431123|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732006440995|4|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732006441034|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732006447702|2|statement|connection 1|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|select * from a006head order by BILLDATE desc|select * from a006head order by BILLDATE desc +1732006447711|1|statement|connection 1|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT codefk,detailid,productid,count,batchno,expiredate,productdate,recount,price,retailprice,productname,standard,bzgg,packunit,prepnspec,prepnunit,measname,registerno,manufactory,remark,remark1,remark2,remark3,remark4,remark5 FROM a0006detail WHERE (detailid = ?)|SELECT codefk,detailid,productid,count,batchno,expiredate,productdate,recount,price,retailprice,productname,standard,bzgg,packunit,prepnspec,prepnunit,measname,registerno,manufactory,remark,remark1,remark2,remark3,remark4,remark5 FROM a0006detail WHERE (detailid = 'RK20211108000004') +1732006447737|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732006447746|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/getOrders', 'POST', '{}', '{"code":20000,"data":{"list":[{"billdate":1636300800000,"billflag":"03","billno":"RK20211108000004","billtype":"R2","codefk":"RK20211108000004","consigneecode":"1034","consigneename":"西药房","consignorcode":"1095未知","consignorname":"1095","createuser":"1218","detailList":[{"batchno":"B2107004","bzgg":"3000ml/袋","codefk":"RK20211108000004","count":27,"detailid":"RK20211108000004","expiredate":1668441600000,"manufactory":"7","measname":"-","packunit":"袋","prepnspec":"-","prepnunit":"-","price":21.13,"productdate":"-","productid":"Y001007","productname":"甘露醇注射液","recount":27,"registerno":"-","remark":"-","remark1":"-","remark2":"-","remark3":"-","remark4":"-","remark5":"-","retailprice":21.13,"standard":"-"}],"inouttype":"入库","invcode":"1034","invname":"西药房"}],"total":1},"message":"success"}', '2024-11-19T16:54:07.664+0800', 'interface', 1, 44 ) +1732007483986|6|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = ?)|SELECT id,appid,`name`,apikey,secretkey,createDate,customerId,companyName FROM auth_license WHERE (`name` = '第三方服务') +1732007484003|0|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = ?) limit 1|SELECT code,name,thirdSys FROM sys_hosp_config WHERE (thirdSys = 'thirdId') limit 1 +1732007505720|2|statement|connection 1|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|SELECT code,name,adnum,idnum,phone,gender,job,borndate,nationality,education,guardianname,guardianrel,curaddr,kosekiaddr,medicalins,remark FROM a008|SELECT code,name,adnum,idnum,phone,gender,job,borndate,nationality,education,guardianname,guardianrel,curaddr,kosekiaddr,medicalins,remark FROM a008 +1732007505752|0|commit|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|| +1732007505760|2|statement|connection 0|url jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )|INSERT INTO sys_erp_log ( url, `name`, params, `result`, createTime, `type`, `status`, time ) VALUES ( '/udiwms/erp/sicker/getInfo', 'POST', '{}', '{"code":20000,"data":{"list":[{"borndate":-681814800000,"code":"PN00000010","curaddr":"四川省绵阳市平武县","gender":"女","idnum":"510727194805254726","kosekiaddr":"四川省绵阳市","name":"陈朝香","phone":"15328222268"}],"total":1},"message":"success"}', '2024-11-19T17:11:45.688+0800', 'interface', 1, 37 ) diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java index fc5d63c..bac92b4 100644 --- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java @@ -19,6 +19,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.client.yxfuyy.entity.InvCodeResultEntity; import com.glxp.mipsdl.client.yxfuyy.entity.InvProjectResultEntity; @@ -39,6 +41,7 @@ import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.*; import com.glxp.mipsdl.entity.ctqyy.*; import com.glxp.mipsdl.entity.inout.*; +import com.glxp.mipsdl.entity.scpwxyy.*; import com.glxp.mipsdl.entity.system.ThrYbSetupMapper; import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; @@ -54,15 +57,19 @@ import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.PageSimpleResponse; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; +import com.glxp.mipsdl.res.scwpxyy.A006headRespone; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.basic.RelCodeDetailService; import com.glxp.mipsdl.service.order.OrderUploadLogService; +import com.glxp.mipsdl.service.scpwxyy.*; import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService; import com.glxp.mipsdl.service.yb.YbClient; import com.glxp.mipsdl.thirddao.ctqyy.*; +import com.glxp.mipsdl.thirddao.scpwxyy.A003Mapper; +import com.glxp.mipsdl.thirddao.scpwxyy.A010detailMapper; import com.glxp.mipsdl.util.*; import lombok.extern.slf4j.Slf4j; import org.dom4j.Document; @@ -142,6 +149,23 @@ public class ScpwxyyClient extends CommonHttpClient { @Resource private RelCodeDetailService relCodeDetailService; + @Resource + private A001Service a001Service; + @Resource + private A004Service a004Service; + @Resource + private A007Service a007Service; + @Resource + private A008Service a008Service; + @Resource + private A005Service a005Service; + @Resource + private A010headService a010headService; + @Resource + private A010detailMapper a010detailMapper; + @Resource + private A003Mapper a003Mapper; + /** * 拼接xml请求头 * @@ -175,20 +199,14 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); -// udiwmsUnitRequest.setUnitType("2"); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialUnit")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsUnitRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_CORP_URL), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - return baseResponse; - } catch (Exception e) { - log.error("解析四川武平县医院智业接口返回往来单位字典数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); - } + udiwmsUnitRequest.setDatabaseProductName(getDataSourceType()); + List list = a001Service.filterList(udiwmsUnitRequest); + log.info("解析四川武平县医院返回往来单位，返回结果：{}", list); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); } @@ -253,25 +271,25 @@ public class ScpwxyyClient extends CommonHttpClient { return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); } } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode()); - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VYpzsPhysicDict::getPHYSIC_NAME, udiwmsProductRequest.getName()); - wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VYpzsPhysicDict::getPHYSIC_NO, udiwmsProductRequest.getRegisterNo()); - IPage page = vYpzsPhysicDictMapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); - List physicDictEntities = page.getRecords(); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), A003::getCode, udiwmsProductRequest.getCode()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), A003::getName, udiwmsProductRequest.getName()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), A003::getRegisterno, udiwmsProductRequest.getRegisterNo()); + IPage page = a003Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); + List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; if (CollUtil.isNotEmpty(physicDictEntities)) { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - products.setCode(dict.getPHYSIC_CODE()); - products.setName(dict.getPHYSIC_NAME()); - products.setMeasname(dict.getPACK_UNIT()); - products.setSpec(dict.getPACK_SPEC()); - products.setYbbm(dict.getCOUNTRY_CODE()); - products.setPrepnSpec(dict.getPHYSIC_SPEC()); - products.setPrepnUnit(dict.getPHYSIC_UNIT()); + products.setCode(dict.getCode()); + products.setName(dict.getName()); + products.setMeasname(dict.getMeasname()); + products.setSpec(dict.getBzgg()); + products.setYbbm(dict.getYbbm()); + products.setPrepnSpec(dict.getPrepnspec()); + products.setPrepnUnit(dict.getPrepnunit()); products.setProductType(2); return products; }).collect(Collectors.toList()); @@ -287,19 +305,16 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialType")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsBusTypeRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - return baseResponse; - } catch (Exception e) { - log.error("解析四川武平县医院智业接口返回单据类型数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); - } + List list = a005Service.list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(udiwmsBusTypeRequest.getCode()),A005::getCode,udiwmsBusTypeRequest.getCode()) + .like(StrUtil.isNotBlank(udiwmsBusTypeRequest.getName()),A005::getSysclass,udiwmsBusTypeRequest.getName()) + ); + log.info("解析四川武平县医院返回单据类型位，返回结果：{}", list); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); } /** @@ -383,27 +398,19 @@ public class ScpwxyyClient extends CommonHttpClient { * @return */ public BaseResponse getSickInfo(GetSickRequest getSickRequest) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getSickVisitInfo")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - Map map = (Map) baseResponse.getData(); - List basicSkSickerResponses = JSON.parseArray(map.get("list") + "", BasicSkSickerResponse.class); -// for (BasicSkSickerResponse productsResponse : basicSkSickerResponses) { -// -// } - map.put("list", JSON.toJSON(basicSkSickerResponses)); - baseResponse.setData(""); - baseResponse.setData(map); - return baseResponse; - } catch (Exception e) { - log.error("解析四川平武县医院智业返回病人信息数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); - } + List list = a008Service.list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(getSickRequest.getCode()),A008::getCode,getSickRequest.getCode()) + .like(StrUtil.isNotBlank(getSickRequest.getName()),A008::getName,getSickRequest.getName()) + .like(StrUtil.isNotBlank(getSickRequest.getAdNum()),A008::getAdnum,getSickRequest.getAdNum()) + .like(StrUtil.isNotBlank(getSickRequest.getIdNum()),A008::getIdnum,getSickRequest.getIdNum()) + .like(StrUtil.isNotBlank(getSickRequest.getPhone()),A008::getPhone,getSickRequest.getPhone()) + ); + log.info("解析四川武平县医院返回患者信息，返回结果：{}", list); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); } /** @@ -527,10 +534,18 @@ public class ScpwxyyClient extends CommonHttpClient { } } + @Resource + private A006headService a006headService; @Override public BaseResponse getOrders(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) { - return null; + udiwmsOrderQueryRequest.setDatabaseProductName(getDataSourceType()); + List list = a006headService.filterList(udiwmsOrderQueryRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); } @Resource @@ -1049,7 +1064,10 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { - return null; + udiwmsWarehouseRequest.setDatabaseProductName(getDataSourceType()); + List list = a004Service.filterList(udiwmsWarehouseRequest); + log.info("解析四川武平县医院返回仓库信息，返回结果：{}", list); + return ResultVOUtils.success(list); } @Override @@ -1066,7 +1084,13 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse queryUdiInvProducts(UdiwmsQueryUdiInvProductsRequest queryUdiInvProductsRequest) { - return null; + List list = a007Service.list(new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(queryUdiInvProductsRequest.getProductName()),A007::getProductname,queryUdiInvProductsRequest.getProductName()) + .like(StrUtil.isNotBlank(queryUdiInvProductsRequest.getSupName()),A007::getSupname,queryUdiInvProductsRequest.getSupName()) + .like(StrUtil.isNotBlank(queryUdiInvProductsRequest.getBatchNo()),A007::getBatchno,queryUdiInvProductsRequest.getBatchNo()) + ); + log.info("解析四川武平县医院返回产品库存信息，返回结果：{}", list); + return ResultVOUtils.success(list); } @Override @@ -1366,28 +1390,32 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); String startTime = udiwmsBasicSkPrescribeRequest.getStartTime(); String endTime = udiwmsBasicSkPrescribeRequest.getEndTime(); - wrapper.ge(StrUtil.isNotEmpty(startTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, startTime); - wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime); + wrapper.ge(StrUtil.isNotEmpty(startTime), A010head::getPrescribedate, startTime); + wrapper.le(StrUtil.isNotEmpty(endTime), A010head::getPrescribedate, endTime); String code = udiwmsBasicSkPrescribeRequest.getCode(); String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName(); String key = udiwmsBasicSkPrescribeRequest.getKey(); - wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code)); - wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, key) - .or().like(VInsurNationGoodsPhysic::getRXNO, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NAME, key) - .or().like(VInsurNationGoodsPhysic::getPSN_NO, key) + wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(A010head::getCodefk, code).or()); + wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(A010head::getCodefk, key) + .or().like(A010head::getCodefk, key) ); - wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); - // 拉取处方时，改成拉取v_ypzs_pres_info - IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), - udiwmsBasicSkPrescribeRequest); + wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(A010head::getDeptname, fromCorpName)); - return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); + if (null != udiwmsBasicSkPrescribeRequest.getPage() && null != udiwmsBasicSkPrescribeRequest.getLimit()) { + PageHelper.offsetPage((udiwmsBasicSkPrescribeRequest.getPage() - 1) * udiwmsBasicSkPrescribeRequest.getLimit(), udiwmsBasicSkPrescribeRequest.getLimit()); + } + List list = a010headService.list(wrapper); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + + return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, pageInfo); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1642,14 +1670,15 @@ public class ScpwxyyClient extends CommonHttpClient { * @param udiwmsBasicSkPrescribeRequest * @return */ - private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { - List presInfoEntities = page.getRecords(); + private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, PageInfo pageInfo) { + List presInfoEntities = pageInfo.getList(); List vInsurNationGoodsPhysics = new ArrayList<>(); if (CollUtil.isNotEmpty(presInfoEntities)) { - List collect = presInfoEntities.stream().map(VYpzsPresInfo::getPRESCRIBE_NUMBER).collect(Collectors.toList()); + List collect = presInfoEntities.stream().map(A010head::getCodefk).collect(Collectors.toList()); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.in(VYpzsPresInfo::getPRESCRIBE_NUMBER, collect); - vInsurNationGoodsPhysics = vYpzsPresInfoMapper.selectList(wrapper1); + + = vYpzsPresInfoMapper.selectList(wrapper1); } // TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic diff --git a/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java b/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java index 2dfa465..a815d36 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/ListPageRequest.java @@ -1,21 +1,29 @@ package com.glxp.mipsdl.req.base; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + /** * 接口分页参数 */ @Data public class ListPageRequest { - /** - * 页码 - */ + + @Min(message = "分页参数错误", value = 1) private Integer page; - /** - * 条数 - */ + + @Min(value = 1, message = "分页参数不能小于1") + @Max(value = 500, message = "分页参数不能大于500") private Integer limit; + private String orderBy; + private String sort; + public Page getPageObj() { + return new Page(this.page == null ? 1 : this.page, this.limit == null ? 10 : this.limit); + } } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderQueryRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderQueryRequest.java index 94a2a6f..a5ea7c6 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderQueryRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderQueryRequest.java @@ -39,4 +39,6 @@ public class UdiwmsOrderQueryRequest extends ListPageRequest { private String billFlag; + private String databaseProductName; + } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsQueryUdiInvProductsRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsQueryUdiInvProductsRequest.java index 00750de..29c1e10 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsQueryUdiInvProductsRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsQueryUdiInvProductsRequest.java @@ -33,4 +33,6 @@ public class UdiwmsQueryUdiInvProductsRequest extends ListPageRequest { @JsonProperty("supName") private String supName; + private String databaseProductName; + } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsUnitRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsUnitRequest.java index 0c1c0d8..8b20e86 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsUnitRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsUnitRequest.java @@ -32,6 +32,7 @@ public class UdiwmsUnitRequest extends ListPageRequest { * 企业类型 1 厂家 2供应商 */ private String unitType; + private String databaseProductName; } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java index 3830c93..a0bdeab 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java @@ -17,5 +17,6 @@ public class UdiwmsWarehouseRequest extends ListPageRequest { * 货位号，支持模糊查询 */ private String warehouseCode; + private String databaseProductName; } diff --git a/src/main/java/com/glxp/mipsdl/res/scwpxyy/A006headRespone.java b/src/main/java/com/glxp/mipsdl/res/scwpxyy/A006headRespone.java new file mode 100644 index 0000000..a2f2e2c --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/res/scwpxyy/A006headRespone.java @@ -0,0 +1,54 @@ +package com.glxp.mipsdl.res.scwpxyy; + +import com.glxp.mipsdl.entity.scpwxyy.A0006detail; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class A006headRespone { + private String codefk; + + private String billno; + + private String billflag; + + private Date billdate; + + private String billtype; + + private String consigneecode; + + private String consigneename; + + private String consignorname; + + private String consignorcode; + + private String inouttype; + + private String createuser; + + private String reviewuser; + + private String address; + + private String linkman; + + private String linktel; + + private String invcode; + + private String invname; + + private String remark; + + private List detailList; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A001Service.java b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A001Service.java index 2687409..1757cef 100644 --- a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A001Service.java +++ b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A001Service.java @@ -1,14 +1,29 @@ package com.glxp.mipsdl.service.scpwxyy; +import com.github.pagehelper.PageHelper; import com.glxp.mipsdl.entity.scpwxyy.A001; +import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import com.glxp.mipsdl.thirddao.scpwxyy.A001Mapper; + +import java.util.Collections; +import java.util.List; + @Service public class A001Service extends ServiceImpl { - @Resource - private A001Mapper a001Mapper; + + public List filterList(UdiwmsUnitRequest udiwmsUnitRequest) { + if (null == udiwmsUnitRequest) { + return Collections.emptyList(); + } + if (null != udiwmsUnitRequest.getPage() && null != udiwmsUnitRequest.getLimit()) { + PageHelper.offsetPage((udiwmsUnitRequest.getPage() - 1) * udiwmsUnitRequest.getLimit(), udiwmsUnitRequest.getLimit()); + } + return this.baseMapper.filterList(udiwmsUnitRequest); + } + } diff --git a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java index 39bd919..6a48737 100644 --- a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java +++ b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java @@ -1,13 +1,32 @@ package com.glxp.mipsdl.service.scpwxyy; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.mipsdl.entity.scpwxyy.A001; import com.glxp.mipsdl.entity.scpwxyy.A004; +import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; +import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.glxp.mipsdl.thirddao.scpwxyy.A004Mapper; + +import java.util.Collections; +import java.util.List; + @Service public class A004Service extends ServiceImpl { @Resource private A004Mapper a004Mapper; + public List filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { + if (null == udiwmsWarehouseRequest) { + return Collections.emptyList(); + } + if (null != udiwmsWarehouseRequest.getPage() && null != udiwmsWarehouseRequest.getLimit()) { + PageHelper.offsetPage((udiwmsWarehouseRequest.getPage() - 1) * udiwmsWarehouseRequest.getLimit(), udiwmsWarehouseRequest.getLimit()); + } + return this.baseMapper.filterList(udiwmsWarehouseRequest); + } + + } diff --git a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A006headService.java b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A006headService.java index 4b6e34b..6b33151 100644 --- a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A006headService.java +++ b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A006headService.java @@ -1,14 +1,45 @@ package com.glxp.mipsdl.service.scpwxyy; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.mipsdl.entity.scpwxyy.A0006detail; import com.glxp.mipsdl.entity.scpwxyy.A006head; +import com.glxp.mipsdl.req.base.UdiwmsOrderQueryRequest; +import com.glxp.mipsdl.res.scwpxyy.A006headRespone; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import com.glxp.mipsdl.thirddao.scpwxyy.A006headMapper; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + @Service public class A006headService extends ServiceImpl { @Resource - private A006headMapper a006headMapper; + private A0006detailService a0006detailService; + + public List filterList(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) { + if (null == udiwmsOrderQueryRequest) { + return Collections.emptyList(); + } + if (null != udiwmsOrderQueryRequest.getPage() && null != udiwmsOrderQueryRequest.getLimit()) { + PageHelper.offsetPage((udiwmsOrderQueryRequest.getPage() - 1) * udiwmsOrderQueryRequest.getLimit(), udiwmsOrderQueryRequest.getLimit()); + } + List list = this.baseMapper.filterList(udiwmsOrderQueryRequest); + if (CollUtil.isNotEmpty(list)) { + list.forEach( item -> { + String billno = item.getBillno(); + if (StrUtil.isNotEmpty(billno)) { + List details = a0006detailService.list(new LambdaQueryWrapper().eq(A0006detail::getDetailid, billno)); + item.setDetailList(details); + } + }); + } + return list; + } } diff --git a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A007Service.java b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A007Service.java index b5826d5..96b22a7 100644 --- a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A007Service.java +++ b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A007Service.java @@ -1,10 +1,17 @@ package com.glxp.mipsdl.service.scpwxyy; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.glxp.mipsdl.entity.scpwxyy.A007; +import com.glxp.mipsdl.req.base.UdiwmsQueryUdiInvProductsRequest; +import com.glxp.mipsdl.res.scwpxyy.A006headRespone; import org.springframework.stereotype.Service; import javax.annotation.Resource; import com.glxp.mipsdl.thirddao.scpwxyy.A007Mapper; + +import java.util.Collections; +import java.util.List; + @Service public class A007Service extends ServiceImpl { diff --git a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A001Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A001Mapper.java index 8c02a13..4439251 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A001Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A001Mapper.java @@ -4,9 +4,13 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic; import com.glxp.mipsdl.entity.scpwxyy.A001; +import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper @DS("scpwxyySql") public interface A001Mapper extends BaseMapper { + List filterList(UdiwmsUnitRequest udiwmsUnitRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java index 5a47907..e4f959f 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java @@ -3,9 +3,13 @@ package com.glxp.mipsdl.thirddao.scpwxyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.scpwxyy.A004; +import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper @DS("scpwxyySql") public interface A004Mapper extends BaseMapper { + List filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A006headMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A006headMapper.java index 767b7ab..a086a69 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A006headMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A006headMapper.java @@ -3,11 +3,15 @@ package com.glxp.mipsdl.thirddao.scpwxyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.mipsdl.entity.scpwxyy.A006head; +import com.glxp.mipsdl.req.base.UdiwmsOrderQueryRequest; +import com.glxp.mipsdl.res.scwpxyy.A006headRespone; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper @DS("scpwxyySql") public interface A006headMapper extends BaseMapper { - + List filterList(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest); } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b8d854a..7ebbcca 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,38 +9,6 @@ spring: username: root password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver - njsql: - # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy - # username: SD_UDIJK - # password: SD_UDIJK - # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver - # thirdSql: - # url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - # username: root - # password: 123456 - # driver-class-name: com.p6spy.engine.spy.P6SpyDriver - ptxhSql: - # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy - # username: SD_UDIJK - # password: SD_UDIJK - # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver - ctqyySql: - # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy - # username: I_YPZS - # password: zy02v4ys - # driver-class-name: oracle.jdbc.driver.OracleDrive - url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.p6spy.engine.spy.P6SpyDriver scpwxyySql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy # username: I_YPZS diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 707950e..60ea25e 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -9,30 +9,11 @@ spring: username: root password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver - njsql: - url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: Glxp@6066 - driver-class-name: com.mysql.cj.jdbc.Driver - ptxhSql: - url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: Glxp@6066 - driver-class-name: com.mysql.cj.jdbc.Driver - ctqyySql: - driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@192.168.0.3:1521/yxfybjy - username: I_YPZS - password: zy02v4ys - hikari: - connection-timeout: 60000 - maximum-pool-size: 60 - minimum-idle: 10 scpwxyySql: driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@192.168.0.3:1521/yxfybjy - username: I_YPZS - password: zy02v4ys + url: jdbc:oracle:thin:@10.82.6.215:1521/pdborcl + username: dtc + password: dtc hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/other/scpwxyy/A001Mapper.xml b/src/main/resources/mybatis/mapper/other/scpwxyy/A001Mapper.xml index 4f6bc22..04be52e 100644 --- a/src/main/resources/mybatis/mapper/other/scpwxyy/A001Mapper.xml +++ b/src/main/resources/mybatis/mapper/other/scpwxyy/A001Mapper.xml @@ -1,20 +1,67 @@ - - - - - - - - - - - - - - - UNITID, `NAME`, LASTUPDATETIME, ADDR, CREDITNO, SPELL, CONTACT, MOBILE - + + + + + + + + + + + + + + + UNITID, `NAME`, LASTUPDATETIME, ADDR, CREDITNO, SPELL, CONTACT, MOBILE + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml b/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml index 6c9c061..1194d40 100644 --- a/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml +++ b/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml @@ -13,4 +13,23 @@ CODE, `NAME`, REMARK, DETAILS + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/scpwxyy/A006headMapper.xml b/src/main/resources/mybatis/mapper/other/scpwxyy/A006headMapper.xml index d2f7bf6..5995d37 100644 --- a/src/main/resources/mybatis/mapper/other/scpwxyy/A006headMapper.xml +++ b/src/main/resources/mybatis/mapper/other/scpwxyy/A006headMapper.xml @@ -1,32 +1,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - CODEFK, BILLNO, BILLFLAG, BILLDATE, BILLTYPE, CONSIGNEECODE, CONSIGNEENAME, CONSIGNORNAME, - CONSIGNORCODE, INOUTTYPE, `CREATEUSER`, REVIEWUSER, ADDRESS, LINKMAN, LINKTEL, INVCODE, - INVNAME, REMARK - + + + + + + + + + + + + + + + + + + + + + + + + + CODEFK, BILLNO, BILLFLAG, BILLDATE, BILLTYPE, CONSIGNEECODE, CONSIGNEENAME, CONSIGNORNAME, + CONSIGNORCODE, INOUTTYPE, `CREATEUSER`, REVIEWUSER, ADDRESS, LINKMAN, LINKTEL, INVCODE, + INVNAME, REMARK + + + + \ No newline at end of file