器械使用清单字段补齐等

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<BasicProductsEntity>()
@@ -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<BasicUdirelEntity>()
                                     .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);
                 });

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