From b77bf02f088304547cc31954561f0a14ebdf7a78 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 17 Oct 2024 09:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E4=BD=BF=E7=94=A8=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E8=A1=A5=E9=BD=90=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java | 8 ++++++-- src/main/resources/application-dev.yml | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 405278a..a12b283 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1833,7 +1833,7 @@ public class CtqyyClient extends CommonHttpClient { value.forEach(entity -> { IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); String med_list_codg = entity.getMED_LIST_CODG(); - collectOrderBiz.setThrCode(med_list_codg); + collectOrderBiz.setThrCode(entity.getMATERIAL_CODE()); BasicProductsEntity basicProductsEntity = null; if (StrUtil.isNotBlank(med_list_codg)) { basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper() @@ -1841,7 +1841,7 @@ public class CtqyyClient extends CommonHttpClient { if (basicProductsEntity != null) { collectOrderBiz.setGgxh(basicProductsEntity.getGgxh()); collectOrderBiz.setMeasureUnit(basicProductsEntity.getPackUnit()); - + collectOrderBiz.setNameCode(basicProductsEntity.getNameCode()); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper() .eq(BasicUdirelEntity::getUuid, basicProductsEntity.getUuid()).last(" limit 1")); if (basicProductsEntity != null) { @@ -1860,8 +1860,12 @@ public class CtqyyClient extends CommonHttpClient { collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setYbbm(entity.getMED_LIST_CODG()); + collectOrderBiz.setProductDate(entity.getMANU_DATE()); + collectOrderBiz.setExpireDate(entity.getEXPY_END()); + collectOrderBiz.setBatchNo(entity.getMANU_LOTNUM()); //==================================== collectOrderBiz.setTagStatus(1); + collectOrderBiz.setCount(entity.getSEL_RETN_CNT()); collectOrderBiz.setUnTagCount(0); bizList.add(collectOrderBiz); }); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 657c7e8..81a1b7c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,9 +5,9 @@ spring: strict: false datasource: master: - url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + 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: Glxp@6066 + password: 123456 driver-class-name: com.p6spy.engine.spy.P6SpyDriver njsql: # jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy @@ -37,7 +37,7 @@ spring: # username: I_YPZS # password: zy02v4ys # 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 + 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