耗材字典新增货号等字段，协调平台查询新增序列号查询

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -437,7 +437,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }
@@ -553,7 +553,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }
@@ -619,7 +619,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }

src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java

@@ -30,4 +30,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailResu
     List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
 
 
+    List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
+
+
 }

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -348,6 +348,9 @@ public class BasicProductsEntity {
     @TableField(value = "remark")
     private String remark;
 
+    @TableField(value = "cphhhbh")
+    private String cphhhbh;
+
     public static final String COL_ID = "id";
 
     public static final String COL_UUID = "uuid";

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -14,6 +14,9 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String code;
     private String name;
     private String deptCode;
+    /**
+     * 1:入账库，2：预验收库，3：寄售库
+     */
     private Integer advanceType;
     private Boolean isDefault;
     private Date updateTime;

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -83,4 +83,6 @@ public class CompanyProductRelevanceResponse {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+
+    private String cphhhbh;
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -119,7 +119,7 @@ public class UdiRelevanceResponse {
     private String syqsfxyjxmj;
     private String mjfs;
     private String categoryName;
-
+    private String cphhhbh;
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

src/main/java/com/glxp/api/res/basic/UdiRlDlResponse.java

@@ -45,6 +45,7 @@ public class UdiRlDlResponse {
     private String sptm;
     private Integer productType;
     private String mainId;
+    private String cphhhbh;
 
     public Integer getProductType() {
         if (productType == null) return 0

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -94,6 +94,6 @@ public class UdiRlSupResponse {
     private String classifyName;
 
     private boolean groupBuy;           //是否集采产品
-
+    private String cphhhbh;
     private Long uid;
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -76,6 +76,9 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
 
     @Override
     public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
+        if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) {
+            return orderDetailResultDao.cptCodeTrace(cptTraceRequest);
+        } else
             return orderDetailResultDao.cptTrace(cptTraceRequest);
     }
 

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -295,7 +295,7 @@ public class SpsSyncDownloadService {
             }
             exportStatus = BasicExportStatusEntity.builder()
                     .id(CustomUtil.getId())
-                    .status(syncTime == null ? BasicExportStatusEnum.WAIT_TRIGGERED.getCode() : BasicExportStatusEnum.WAIT_BUILT.getCode())
+                    .status(BasicExportStatusEnum.WAIT_BUILT.getCode())
                     .idDatas(exportEnum.getKey())
                     .type(exportEnum.getRemark())
                     .scheduleType(0)
@@ -303,9 +303,9 @@ public class SpsSyncDownloadService {
                     .startTime(now)
                     .build();
             basicExportService.save(exportStatus);
-            if (syncTime != null) {
+//            if (syncTime != null) {
             createFileMethod.apply(applicationContext.getBean(this.getClass()));
-            }
+//            }
         } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
             createFileMethod.apply(applicationContext.getBean(this.getClass()));
         }

src/main/java/com/glxp/api/util/JasperUtils.java

@@ -2,12 +2,14 @@ package com.glxp.api.util;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
 import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory;
 import net.sf.jasperreports.engine.util.JRLoader;
 import net.sf.jasperreports.export.SimpleExporterInput;
 import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -28,6 +30,7 @@ import java.util.Map;
  * @date 2021-11-10 22:23
  */
 @Component
+@Slf4j
 public class JasperUtils {
     private static Logger logger = LoggerFactory.getLogger(JasperUtils.class);
 
@@ -102,7 +105,7 @@ public class JasperUtils {
                 os.close();
             }
         } catch (Exception e) {
-
+            log.error(ExceptionUtils.getStackTrace(e));
             e.printStackTrace();
 
         }

src/main/java/com/glxp/api/util/SupplementVailUtil.java

@@ -131,6 +131,15 @@ public class SupplementVailUtil {
                     if (!systemParamConfigEntity.getParamValue().equals("0")) {
                         return systemParamConfigEntity.getParamValue() + "不能为空";
                     }
+                } else {
+                    if (supplementRequest.getBasicPrductRemak6().equals("1")) {
+                        if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) {
+                            SystemParamConfigEntity temp = systemParamConfigEntityMap.get("basicPrductRemak8");
+                            if (!temp.getParamValue().equals("0")) {
+                                return temp.getParamValue() + "不能为空";
+                            }
+                        }
+                    }
                 }
             }
             basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7");

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/application-pro.yml

@@ -13,7 +13,7 @@ spring:
   redis:
     database: 10
     host: 127.0.0.1
-    port: 6404
+    port: 6379
     #    password: 123456
     timeout: 300
     jedis:
@@ -43,15 +43,20 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: /udi/udiwms/udiwmsfile/
+
-back_file_path: /share/udisps/back/
+file_path: D:/udi/udiwms/udiwmsfile/
-err_path: /udi/udiwms/err/
+file_lpath: /udiwms/image/register/file/getImage
+file_url: http://127.0.0.1:9993
+minio_path: /udi
+minio_url: http://139.9.219.60:9000
+err_path: d:/udi/udiwms/err/
+back_file_path: d:/share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L
-WEB_TITLE: 漳州市中医院
+WEB_TITLE: 大田县总医院
 
 WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

src/main/resources/application.yml

@@ -7,6 +7,7 @@ spring:
     multipart:
       max-file-size: 200MB
       max-request-size: 200MB
+      location: D:/tmp
 mybatis-plus:
   mapper-locations: classpath:mybatis/mapper/*/*.xml
   configuration:

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -91,7 +91,7 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,
+               basic_products.categoryName,basic_products.cphhhbh,
                basic_products.hchzsb
         FROM (company_product_relevance
                 inner JOIN basic_udirel

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -65,7 +65,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName
+               basic_products.categoryName,
+               basic_products.cphhhbh
         FROM basic_udirel
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid
@@ -325,7 +326,7 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,
+               basic_products.categoryName,basic_products.cphhhbh,
                company_product_relevance.unitFk,
                basic_corp.name companyName
         FROM basic_udirel
@@ -463,7 +464,8 @@
                basic_products.mjfs,
                basic_products.categoryName,
                basic_products.groupBuy,
-               basic_products.basicPrductRemak8
+               basic_products.basicPrductRemak8,
+        basic_products.cphhhbh
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
@@ -645,7 +647,7 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName
+               basic_products.categoryName,basic_products.cphhhbh
         FROM basic_products
                      inner JOIN basic_udirel
                 ON basic_products.uuid = basic_udirel.uuid
@@ -820,7 +822,7 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName
+               basic_products.categoryName,basic_products.cphhhbh
         from basic_udirel
                      INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
         <where>
@@ -1254,7 +1256,7 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName
+               basic_products.categoryName,basic_products.cphhhbh
         FROM basic_udirel
                      INNER JOIN basic_products
                 on basic_udirel.uuid = basic_products.uuid
@@ -1374,7 +1376,7 @@
                basic_products.mjfs,
                basic_products.categoryName,
                company_product_relevance.unitFk,
-               basic_corp.name companyName
+               basic_corp.name companyName,basic_products.cphhhbh
         FROM basic_udirel
                      inner JOIN basic_products
                 ON basic_products.uuid = basic_udirel.uuid

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -102,6 +102,7 @@
                basic_products.basicPrductRemak6,
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
+               basic_products.cphhhbh,
                basic_products.sfwblztlcp,
                basic_products.cgzmraqxgxx,
                basic_products.sfbjwycxsy,
@@ -109,9 +110,8 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-               basic_products.categoryName,
+               basic_products.categoryName,basic_products.cphhhbh,
                basic_udirel.groupBuy,
-
                basic_udirel.id   as uid,
                basic_corp.name      companyName
         FROM company_product_relevance
@@ -377,11 +377,9 @@
 
     <select id="filterCompanyProduct" parameterType="com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest"
             resultType="com.glxp.api.req.inout.ioOrderUploadRequest">
-        SELECT
+        SELECT basic_udirel.id,
-        basic_udirel.id,
                basic_udirel.uuid as udiRlIdFk
-        FROM
+        FROM company_product_relevance
-        company_product_relevance
                      INNER JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id
                      INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
                      LEFT JOIN basic_corp ON basic_corp.erpId = company_product_relevance.customerId

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -89,7 +89,8 @@
                basic_corp.creditNo,
                io.action,
                io.fromInvCode,
-               bbt.corpType,iodr.reCount count
+               bbt.corpType,
+               iodr.reCount      count
         from io_order_detail_result iodr
                      INNER JOIN io_order io on iodr.orderIdFk = io.billNo
                      left join basic_corp on io.fromCorp = basic_corp.erpId
@@ -107,4 +108,36 @@
             </if>
         </where>
     </select>
+    <select id="cptCodeTrace" parameterType="com.glxp.api.req.inout.CptTraceRequest"
+            resultType="com.glxp.api.res.inout.CptTraceOrderResponse">
+        select io.billNo,
+               io.createTime,
+               io.mainAction,
+               bbt.`name`        billType,
+               basic_corp.`name` fromCorpName,
+               basic_corp.creditNo,
+               io.action,
+               io.fromInvCode,
+               bbt.corpType,
+               iodr.reCount      count
+        from io_code iodr
+                     INNER JOIN io_order io on iodr.orderId = io.billNo
+                     left join basic_corp on io.fromCorp = basic_corp.erpId
+                     INNER JOIN basic_bussiness_type bbt on io.action = bbt.action
+        <where>
+            and bbt.inStock = true
+            <if test="batchNo != null and batchNo != ''">
+                AND iodr.batchNo = #{batchNo}
+            </if>
+            <if test="diList != null and diList.size() != 0">
+                AND iodr.`nameCode` in
+                <foreach collection="diList" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="serialNo != null and serialNo != ''">
+                AND iodr.serialNo = #{serialNo}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/schemas/schema_v2.3.sql

@@ -695,3 +695,4 @@ CALL Pro_Temp_ColumnWork('io_order_detail_code', 'sterDate', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'cphhhbh', 'varchar(255)', 1);