Merge remote-tracking branch 'origin/master'

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

@@ -120,6 +120,53 @@ public class SupCertController {
                     }
                 }
             }
+        }else{
+            if(postSelCertRequest.getProductIdFk()==null) {
+                String errMsg = "";
+                ArrayList<String> list = new ArrayList<>();
+                int i = postSelCertRequest.getSupCertSetEntities().size();
+                for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
+                    i--;
+                    FilterSupCertRequest supCertRequest = new FilterSupCertRequest();
+                    supCertRequest.setName(supCertSetEntity.getName());
+                    supCertRequest.setCustomerId(customerId);
+                    supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk());
+                    supCertRequest.setType(2);
+                    List<SupCertEntity> supCertEntities = supCertService.selectCompanyCert(supCertRequest);
+                    if (supCertEntities.size() != 0) {
+                        list.add(supCertEntities.get(0).getName());
+                        if (supCertEntities.size() != 0 && i == 0) {
+                            for (String s : list) {
+                                errMsg = errMsg + "," + s;
+                            }
+                            return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！");
+                        }
+                    }
+                }
+            }else{
+                String errMsg = "";
+                ArrayList<String> list = new ArrayList<>();
+                int i = postSelCertRequest.getSupCertSetEntities().size();
+                for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
+                    i--;
+                    FilterSupCertRequest supCertRequest = new FilterSupCertRequest();
+                    supCertRequest.setName(supCertSetEntity.getName());
+                    supCertRequest.setCustomerId(customerId);
+                    supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk());
+                    supCertRequest.setProductIdFk(postSelCertRequest.getProductIdFk());
+                    supCertRequest.setType(3);
+                    List<SupCertEntity> supCertEntities = supCertService.selectCompanyCert(supCertRequest);
+                    if (supCertEntities.size() != 0) {
+                        list.add(supCertEntities.get(0).getName());
+                        if (supCertEntities.size() != 0 && i == 0) {
+                            for (String s : list) {
+                                errMsg = errMsg + "," + s;
+                            }
+                            return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！");
+                        }
+                    }
+                }
+            }
         }
 
 

src/main/java/com/glxp/api/idc/utils/TableUtils.java

@@ -5,6 +5,8 @@ package com.glxp.api.idc.utils;
  */
 public class TableUtils {
     /*同步表,格式：同步设置表列名/同步设置表列名(子表时设置，主表不设置)/主表唯一列(多列逗号分隔)/主表关联列/子表关联列/数据库实际表/时间列/图片或文件列/数据条件/说明*/
+
+//同步设置表字段(主表设置）/同步设置表字段(字表设置）/表名/主表唯一键/
     private static final String[] SYNC_TABLES = {
             "basicProducts//basic_udirel/id///updateTime///耗材字典",
             "/basicProducts/basic_products/id/uuid/uuid////耗材字典信息详情",
@@ -19,9 +21,12 @@ public class TableUtils {
             "/productCert/sup_cert/id/productId/productIdFk/updateTime/filePath/type=3/产品资质证书信息",
             "//udicompany/id///updateTime///国际库医疗器械注册人信息",
             "basicType//basic_hosp_type/id///updateTime///物资字典分类",
+
     };
 
     /**
+     *   "//auth_dept/id///updateTime///部门信息",
+     *             "//auth_warehouse/id///updateTime///仓库信息",
      * "typeThird//thr_bustype_origin/id///updateTime///第三方单据类型",
      * "basicThirdCorp//thr_corp/id///updateTime///第三方往来单位",
      * "//thr_dept/id///updateTime///第三方部门",

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

@@ -116,7 +116,7 @@ public class SpsSyncDownloadService {
                 }
             }
         }
-
+        syncOrderResponse.setCodeEntities(codeEntities);
         syncOrderResponse.setOrderDetailBizEntities(orderDetailBizEntities);
         syncOrderResponse.setOrderDetailCodeEntities(orderDetailCodeEntities);
         syncOrderResponse.setOrderDetailResultEntities(orderDetailResultEntities);

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:
@@ -13,7 +13,7 @@ spring:
   redis:
     database: 10
     host: 127.0.0.1
-    port: 6379
+    port: 6404
     #    password: 123456
     timeout: 300
     jedis:
@@ -43,8 +43,8 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: D:/udi/udiwms/udiwmsfile/
-back_file_path: D:/share/udisps/back/
+file_path: /udi/udiwms/udiwmsfile/
+back_file_path: /share/udisps/back/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: false
   servlet:
@@ -26,7 +26,7 @@ pagehelper:
   returnPageInfo: none
   auto-dialect: true
   auto-runtime-dialect: true
-  
+
 server:
   tomcat:
     max-http-form-post-size: 100MB

src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml

@@ -5,7 +5,7 @@
     <select id="get" resultType="com.glxp.api.entity.auth.AuthLicense">
         SELECT *
         FROM auth_license
-        where id = #{id}
+        where apiKey = #{id}
     </select>
     <insert id="save" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthLicense">
         INSERT INTO auth_license(id, appid, name, apiKey, secretKey, createDate, customerId, companyName)
@@ -51,4 +51,4 @@
         </set>
         where name = #{name}
     </update>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/purchase/SupCertDao.xml

@@ -71,7 +71,12 @@
             <if test="manufacturerIdFk != null and manufacturerIdFk != ''">
                 and manufacturerIdFk = #{manufacturerIdFk}
             </if>
-
+            <if test="productIdFk != null and productIdFk != ''">
+                and productIdFk = #{productIdFk}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
         </where>
 
     </select>

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

@@ -140,8 +140,6 @@ CALL Pro_Temp_ColumnWork('inv_product', 'availableStock', 'int ', 1);
 
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'updateTime', 'datetime ', 1);
 
-
-
 CALL Pro_Temp_ColumnWork('sync_data_set', 'basicType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_set', 'basicDept', 'tinyint', 1);