第三方数据与基础 信息bug修复

api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java

@@ -25,4 +25,16 @@ public class ConstantStatus {
     public static final Integer ORDER_SIGN_UN = 0;    //未签字
     public static final Integer ORDER_SIGN_ED = 1;    //已签字
     public static final Integer ORDER_SIGN_FAIL = 2;    //签字失败
+
+
+    //UDI产品信息表字段类型
+    public static final Integer PRODUCT_TYPE_UDI = 0;
+    public static final Integer PRODUCT_TYPE_THIRD = 1;
+
+    //DI类型
+    public static final Integer DI_TYPE_MAIN = 1;//主标识
+    public static final Integer DI_TYPE_SYDY = 2;//使用单元
+    public static final Integer DI_TYPE_BTBS = 3;//本体标识
+    public static final Integer DI_TYPE_BZBS = 4;//包装标识
+
 }

api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.auth;
 
 import com.glxp.api.admin.req.auth.LoginRequest;
 import com.glxp.api.admin.req.auth.UpdatePasswordRequest;
+import com.glxp.api.admin.util.DateUtil;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -78,6 +79,7 @@ public class LoginController {
         Map<String, Object> map = new HashMap<>();
         map.put("id", authAdmin.getId());
         map.put("token", token);
+        map.put("time", DateUtil.getDateTime());
 
         return ResultVOUtils.success(map);
     }

api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java

@@ -148,7 +148,7 @@ public class CorpImportLogController {
                 corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
                 corpImportLogService.insertImportLog(corpImportLogEntity);
                 List<CorpImportDetailEntity> corpImportDetailEntities = new ArrayList<>();
-                for (int j = 0; j < workbook.getNumberOfSheets(); j++) {
+                for (int j = 0; j < 1; j++) {
                     sheet = workbook.getSheetAt(j);
                     if (sheet == null) {
                         continue;
@@ -164,13 +164,16 @@ public class CorpImportLogController {
                                     || !"联系人".equals(row.getCell(4).getStringCellValue())
                                     || !"联系电话".equals(row.getCell(5).getStringCellValue())
                                     || !"社会信用号".equals(row.getCell(6).getStringCellValue())
-                                    || !"往来单位状态".equals(row.getCell(6).getStringCellValue())
+                                    || !"往来单位状态".equals(row.getCell(7).getStringCellValue())
-                                    || !"往来单位类型".equals(row.getCell(6).getStringCellValue())
+                                    || !"往来单位类型".equals(row.getCell(8).getStringCellValue())
-                                    || !"thirdId".equals(row.getCell(6).getStringCellValue()))) {
+                                    || !"thirdId".equals(row.getCell(9).getStringCellValue()))) {
                         return ResultVOUtils.error(500, "文件格式错误！");
                     }
                     for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) {
                         row = sheet.getRow(k);
+                        if (row.getRowNum() <= 0) {
+                            continue;
+                        }
                         CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
                         Cell cell1 = row.getCell(0);
                         if (cell1 != null) {

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java

@@ -160,10 +160,7 @@ public class UdiInfoController {
         if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
             return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
 
-
-
         if (basicThirdSysDetailEntity.getEnabled()) {
-
             if (basicThirdSysDetailEntity.getFromType() == 0 || (filterErpGoodsRequest.getIsDownThrSys() != null && filterErpGoodsRequest.getIsDownThrSys())) {
                 ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
                 BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
@@ -186,8 +183,7 @@ public class UdiInfoController {
             } else {
                 FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
                 BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
-
+                filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys());
-                filterThrProductsRequest.setUnionCode(filterErpGoodsRequest.getCode());
                 filterThrProductsRequest.setCode(null);
 
                 List<ThrProductsEntity> thrCorpEntities

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java

@@ -9,6 +9,8 @@ import com.glxp.api.admin.req.basic.UdiInfoExportRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
+import com.glxp.api.admin.res.basic.UdiRlDlResponse;
+import com.glxp.api.admin.res.inout.WarehouseResponse;
 import com.glxp.api.admin.service.basic.UdiInfoExportLogService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import com.glxp.api.admin.thread.BasicGenExcelService;
@@ -16,6 +18,7 @@ import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,6 +32,7 @@ import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 医疗器械信息导出
@@ -170,12 +174,17 @@ public class UdiInfoExportLogController {
 
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
         udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-
+        List<UdiRlDlResponse> udiRlDlResponses = udiRelevanceResponses.stream().map(item ->
+        {
+            UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse();
+            BeanUtils.copyProperties(item, udiRlDlResponse);
+            return udiRlDlResponse;
+        }).collect(Collectors.toList());
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
-        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<UdiRlDlResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(udiRelevanceResponses);
+        pageSimpleResponse.setList(udiRlDlResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java

@@ -147,7 +147,7 @@ public class UdiInfoImportLogController {
                 udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
                 udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity);
                 List<UdiInfoImportDetailEntity> udiInfoImportEntities = new ArrayList<>();
-                for (int j = 0; j < workbook.getNumberOfSheets(); j++) {
+                for (int j = 0; j < 1; j++) {
                     sheet = workbook.getSheetAt(j);
                     if (sheet == null) {
                         continue;
@@ -167,6 +167,20 @@ public class UdiInfoImportLogController {
                     }
                     for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) {
                         row = sheet.getRow(k);
+                        if (row.getRowNum() <= 0) {
+                            continue;
+                        }
+                        if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null
+                                && row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null&& row.getCell(6) == null) ||
+                                ("".equals(row.getCell(0).getStringCellValue())
+                                        && "".equals(row.getCell(1).getStringCellValue())
+                                        && "".equals(row.getCell(2).getStringCellValue())
+                                        && "".equals(row.getCell(3).getStringCellValue())
+                                        && "".equals(row.getCell(4).getStringCellValue())
+                                        && "".equals(row.getCell(5).getStringCellValue())
+                                        && "".equals(row.getCell(6).getStringCellValue()))) {
+                            continue;
+                        }
                         UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity();
                         Cell cell1 = row.getCell(0);
                         if (cell1 != null) {

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java

@@ -290,12 +290,22 @@ public class UdiRelevanceController {
         if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
             return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
         String url = basicThirdSysDetailEntity.getValue();
+        if (basicThirdSysDetailEntity.getFromType() == 0) {
             String errMsg = basicUpdateProductService.addProduct(combineRequest, url);
             if (errMsg == null)
                 return ResultVOUtils.success("添加成功！");
             else {
                 return ResultVOUtils.error(500, errMsg);
             }
+        } else {
+            String errMsg = basicUpdateProductService.addLocalProduct(combineRequest);
+            if (errMsg == null)
+                return ResultVOUtils.success("添加成功！");
+            else {
+                return ResultVOUtils.error(500, errMsg);
+            }
+        }
+
     }
 
 

api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java

@@ -148,7 +148,7 @@ public class ThrOrderImportLogController {
                 thrOrderImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
                 thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity);
                 List<ThrOrderImportDetailEntity> corpImportDetailEntities = new ArrayList<>();
-                for (int j = 0; j < workbook.getNumberOfSheets(); j++) {
+                for (int j = 0; j < 1; j++) {//workbook.getNumberOfSheets()
                     sheet = workbook.getSheetAt(j);
                     if (sheet == null) {
                         continue;
@@ -168,6 +168,9 @@ public class ThrOrderImportLogController {
                     }
                     for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) {
                         row = sheet.getRow(k);
+                        if (row.getRowNum() <= 0) {
+                            continue;
+                        }
                         ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity();
                         Cell cell1 = row.getCell(0);
                         if (cell1 != null) {

api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java

@@ -30,8 +30,7 @@ public class ThrProductsImportLogController {
     @Resource
     ThrProductsImportDetailService thrProductsImportDetailService;
 
-    @GetMapping("/udiwms/thrProducts//importLog/filter")
+    @GetMapping("/udiwms/thrProducts/importLog/filter")
-
     public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
                                BindingResult bindingResult) {
 

api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java

@@ -34,6 +34,7 @@ public class UdiInfoEntity {
     private String sptm;
     private String manufactory;
     private String measname;
+    private Integer productType;
 
 
     //本地生成信息
@@ -98,6 +99,7 @@ public class UdiInfoEntity {
         }
         return bhzxxsbzsl;
     }
+
     public String getSptm() {
         return sptm;
     }
@@ -379,4 +381,12 @@ public class UdiInfoEntity {
     public void setCheck(Boolean check) {
         isCheck = check;
     }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java

@@ -65,6 +65,9 @@ public class ErpInvClient {
             paramMap.put("registerCertNo", onhandRequest.getRegisterCertNo());
         if (onhandRequest.getManufactory() != null && !onhandRequest.getManufactory().equals(""))
             paramMap.put("manufactory", onhandRequest.getManufactory());
+
+        if (onhandRequest.getFilterCount() != null && !onhandRequest.getFilterCount().equals(""))
+            paramMap.put("filterCount", onhandRequest.getFilterCount());
         if (onhandRequest.getPage() != null)
             paramMap.put("page", onhandRequest.getPage());
         if (onhandRequest.getLimit() != null)

api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java

@@ -28,4 +28,5 @@ public class ErpOnhandRequest extends ListPageRequest {
     private String spec;
     private String registerCertNo;
     private String manufactory;
+    private Integer filterCount;//0:不过滤，1，过滤等于0，2.过滤大于0
 }

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java

@@ -26,4 +26,5 @@ public class FilterThrInvProductsRequest extends ListPageRequest {
     private String spec;
     private String registerCertNo;
     private String manufactory;
+    private Integer filterCount;//0:不过滤，1，过滤等于0，2.过滤大于0
 }

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

@@ -48,5 +48,5 @@ public class UdiRelevanceResponse {
     private Boolean isDisable;
     private String erpId;
     private String erpName;
-
+    private Integer productType;
 }

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

@@ -0,0 +1,53 @@
+package com.glxp.api.admin.res.basic;
+
+import lombok.Data;
+
+@Data
+public class UdiRlDlResponse {
+
+    private int id;
+    private String thirdId;
+    private String thirdName;
+    private String uuid;
+    private String nameCode;
+    private String packLevel;
+    private String packRatio;
+    private Integer bhxjsl;
+    private Integer bhzxxsbzsl;
+    private Integer zxxsbzbhsydysl;
+    private String bhxjcpbm;
+    private String sjcpbm;  //
+    private String bzcj;
+    private String addType;
+    private String deviceRecordKey;
+    private int isUseDy;
+    private String cpmctymc;
+    private String cplb;
+    private String flbm;
+    private String ggxh;
+    private String qxlb;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarywmc;
+    private String sydycpbs;
+    private int versionNumber;
+    private int diType;
+    private String thirdId1;
+    private String thirdName1;
+    private String thirdId2;
+    private String thirdName2;
+    private String thirdId3;
+    private String thirdName3;
+    private String thirdId4;
+    private String thirdName4;
+    private String ybbm;
+    private String sptm;
+    private Integer productType;
+
+    public Integer getProductType() {
+        if (productType == null) return 0
+                ;
+        return productType;
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.thread;
 
+import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
@@ -84,7 +85,8 @@ public class BasicBackUpdateProductService {
                         udiInfoEntity.setCpmctymc(invmandocResponse.getName());
                         udiInfoEntity.setGgxh(invmandocResponse.getSpec());
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
-                        udiInfoEntity.setDiType(1);
+                        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+                        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
 
                         udiInfoEntity.setManufactory(invmandocResponses.get(0).getManufactory());
                         udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory());
@@ -186,7 +188,8 @@ public class BasicBackUpdateProductService {
                         udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
                         udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
-                        udiInfoEntity.setDiType(1);
+                        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+                        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
                         udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
                         udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                         udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
@@ -251,7 +254,8 @@ public class BasicBackUpdateProductService {
         udiInfoEntity.setCpmctymc(onhandQueryResponse.getName());
         udiInfoEntity.setGgxh(onhandQueryResponse.getSpec());
         udiInfoEntity.setUuid(CustomUtil.getUUId());
-        udiInfoEntity.setDiType(1);
+        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
         udiInfoEntity.setManufactory(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setYlqxzcrbarmc(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setZczbhhzbapzbh(erpProductsMap.get(onhandQueryResponse.getCode()).getRegisterNo());
@@ -289,7 +293,8 @@ public class BasicBackUpdateProductService {
         udiInfoEntity.setCpmctymc(onhandQueryResponse.getName());
         udiInfoEntity.setGgxh(onhandQueryResponse.getSpec());
         udiInfoEntity.setUuid(CustomUtil.getUUId());
-        udiInfoEntity.setDiType(1);
+        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
         udiInfoEntity.setManufactory(erpProductsResponse.getManufactory());
         udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory());
         udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo());

api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java

@@ -3,6 +3,7 @@ package com.glxp.api.admin.thread;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.admin.constant.BasicProcessStatus;
+import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
@@ -105,7 +106,8 @@ public class BasicUdiInfoImportService {
                             udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
                             udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
                             udiInfoEntity.setUuid(CustomUtil.getUUId());
-                            udiInfoEntity.setDiType(1);
+                            udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+                            udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
                             udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
                             udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                             udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());

api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java

@@ -2,11 +2,13 @@ package com.glxp.api.admin.thread;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
 import com.glxp.api.admin.entity.basic.UdiEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
+import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.ErpBasicClient;
 import com.glxp.api.admin.httpclient.ErpInvClient;
@@ -14,6 +16,7 @@ import com.glxp.api.admin.req.basic.CombineRequest;
 import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.api.admin.req.inventory.ErpOnhandRequest;
+import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.ErpProductsResponse;
@@ -22,6 +25,7 @@ import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
 import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
+import com.glxp.api.admin.service.thrsys.ThrInvProductsService;
 import com.glxp.api.admin.service.thrsys.ThrProductsService;
 import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.admin.util.DateUtil;
@@ -53,6 +57,8 @@ public class BasicUpdateProductService {
     @Resource
     ThrProductsService thrProductsService;
     @Resource
+    ThrInvProductsService thrInvProductsService;
+    @Resource
     SystemParamConfigService systemParamConfigService;
     @Resource
     BasicThirdSysDetailService basicThirdSysDetailService;
@@ -83,6 +89,7 @@ public class BasicUpdateProductService {
                             BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
                             ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
                             erpOnhandRequest.setInventoryCodes(inventoryCodes);
+                            erpOnhandRequest.setFilterCount(2);
                             List<ErpInvProductResponse> erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, inQuery.getValue());
                             if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) {
                                 ErpInvProductResponse erpInvProductResponse = erpOnHandResponses.get(0);
@@ -93,47 +100,19 @@ public class BasicUpdateProductService {
                                 errMsg = "部分未找到库存信息无法添加！";
                             }
                         } else {
-                            FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest();
+                            FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest();
-                            filterThrInvProductsRequest.setCode(inventoryCode);
+                            filterThrInvProductsRequest.setInventoryCode(inventoryCode);
-                            List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest);
+                            filterThrInvProductsRequest.setFilterCount(2);
-                            if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
+                            List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
-                                for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
+                            if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) {
-                                    UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                                ThrInvProductsEntity thrInvProductsEntity = thrInvProductsEntities.get(0);
-                                    udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+                                Map<String, ErpProductsResponse> erpProductsMap = new HashMap<>();
-                                    udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+                                ErpInvProductResponse erpProductsResponse = new ErpInvProductResponse();
-                                    udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+                                BeanUtils.copyProperties(thrInvProductsEntity, erpProductsResponse);
-                                    udiInfoEntity.setUuid(CustomUtil.getUUId());
+                                erpProductsResponse.setCode(thrInvProductsEntity.getInventoryCode());
-                                    udiInfoEntity.setDiType(1);
+                                erpProductsResponse.setName(thrInvProductsEntity.getInventoryName());
-                                    udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+                                erpProductsMap.put(thrInvProductsEntity.getInventoryCode(), erpProductsResponses.get(0));
-                                    udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
+                                addRl(erpProductsResponse, combineRequest.getThirdSys(), erpProductsMap);
-                                    udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-                                    udiInfoService.insertUdiInfo(udiInfoEntity);
-                                    UdiRelevanceEntity udiRelevanceEntity2 = new UdiRelevanceEntity();
-                                    udiRelevanceEntity2.setUuid(udiInfoEntity.getUuid());
-
-
-                                    if ("thirdId".equals(combineRequest.getThirdSys())) {
-                                        udiRelevanceEntity2.setThirdId(thrProductsEntity.getCode());
-                                        udiRelevanceEntity2.setThirdName(thrProductsEntity.getName());
-                                    } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
-                                        udiRelevanceEntity2.setThirdId1(thrProductsEntity.getCode());
-                                        udiRelevanceEntity2.setThirdName1(thrProductsEntity.getName());
-                                    } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
-                                        udiRelevanceEntity2.setThirdId4(thrProductsEntity.getCode());
-                                        udiRelevanceEntity2.setThirdName4(thrProductsEntity.getName());
-                                    } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
-                                        udiRelevanceEntity2.setThirdId3(thrProductsEntity.getCode());
-                                        udiRelevanceEntity2.setThirdName3(thrProductsEntity.getName());
-                                    } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
-                                        udiRelevanceEntity2.setThirdId4(thrProductsEntity.getCode());
-                                        udiRelevanceEntity2.setThirdName4(thrProductsEntity.getName());
-                                    }
-
-                                    udiRelevanceEntity2.setThirdId(thrProductsEntity.getCode());
-                                    udiRelevanceEntity2.setThirdName(thrProductsEntity.getName());
-                                    udiRelevanceEntity2.setUpdateTime(DateUtil.getDateTime());
-                                    udiRelevanceService.insertUdiRelevance(udiRelevanceEntity2);
-                                }
                             } else {
                                 errMsg = "部分未找到库存信息无法添加！";
                             }
@@ -149,7 +128,8 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setGgxh(erpProductsResponse.getSpec());
                         udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo());
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
-                        udiInfoEntity.setDiType(1);
+                        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+                        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
                         udiInfoService.insertUdiInfo(udiInfoEntity);
                         udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                         udiRelevanceEntity1.setThirdName(erpProductsResponse.getName());
@@ -162,6 +142,83 @@ public class BasicUpdateProductService {
         return errMsg;
     }
 
+    public String addLocalProduct(CombineRequest combineRequest) {
+        String errMsg = null;
+        List<String> inventoryCodes = new ArrayList<>();
+        if (combineRequest.getThirdIds() == null)
+            inventoryCodes.add(combineRequest.getThirdId());
+        else {
+            inventoryCodes = combineRequest.getThirdIds();
+        }
+        if (inventoryCodes.size() > 0) {
+            for (String inventoryCode : inventoryCodes) {
+                UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
+                udiRelevanceEntity1.setThirdId(inventoryCode);
+                FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+                filterThrProductsRequest.setCode(inventoryCode);
+                List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
+                if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
+                    ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
+                    ErpProductsResponse erpProductsResponse = new ErpProductsResponse();
+                    BeanUtils.copyProperties(thrProductsEntity, erpProductsResponse);
+                    if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
+                        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
+                        if (basicThirdSysDetailEntity.getFromType() == 0) {
+                            BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
+                            ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
+                            erpOnhandRequest.setInventoryCodes(inventoryCodes);
+                            erpOnhandRequest.setFilterCount(2);
+                            List<ErpInvProductResponse> erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, inQuery.getValue());
+                            if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) {
+                                ErpInvProductResponse erpInvProductResponse = erpOnHandResponses.get(0);
+                                Map<String, ErpProductsResponse> erpProductsMap = new HashMap<>();
+                                erpProductsMap.put(erpInvProductResponse.getCode(), erpProductsResponse);
+                                addRl(erpInvProductResponse, combineRequest.getThirdSys(), erpProductsMap);
+                            } else {
+                                errMsg = "部分未找到库存信息无法添加！";
+                            }
+                        } else {
+                            FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest();
+                            filterThrInvProductsRequest.setInventoryCode(inventoryCode);
+                            filterThrInvProductsRequest.setFilterCount(2);
+                            List<ThrInvProductsEntity> thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
+                            if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) {
+                                ThrInvProductsEntity thrInvProductsEntity = thrInvProductsEntities.get(0);
+                                Map<String, ErpProductsResponse> erpProductsMap = new HashMap<>();
+                                ErpInvProductResponse erpInvProductResponse = new ErpInvProductResponse();
+                                BeanUtils.copyProperties(thrInvProductsEntity, erpInvProductResponse);
+                                erpInvProductResponse.setCode(thrInvProductsEntity.getInventoryCode());
+                                erpInvProductResponse.setName(thrInvProductsEntity.getInventoryName());
+                                erpProductsMap.put(thrInvProductsEntity.getInventoryCode(), erpProductsResponse);
+                                addRl(erpInvProductResponse, combineRequest.getThirdSys(), erpProductsMap);
+                            } else {
+                                errMsg = "部分未找到库存信息无法添加！";
+                            }
+                        }
+                    } else {
+                        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                        BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
+                        udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+                        udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+                        udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+                        udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
+                        udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+                        udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
+                        udiInfoEntity.setUuid(CustomUtil.getUUId());
+                        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+                        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
+                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
+                        udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
+                        udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());
+                        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
+                    }
+                }
+            }
+        }
+        return errMsg;
+    }
+
     public void addRl(ErpInvProductResponse onhandQueryResponse, String
             thirdSysId, Map<String, ErpProductsResponse> erpProductsMap) {
         UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
@@ -169,7 +226,8 @@ public class BasicUpdateProductService {
         udiInfoEntity.setCpmctymc(onhandQueryResponse.getName());
         udiInfoEntity.setGgxh(onhandQueryResponse.getSpec());
         udiInfoEntity.setUuid(CustomUtil.getUUId());
-        udiInfoEntity.setDiType(1);
+        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
         udiInfoEntity.setManufactory(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setYlqxzcrbarmc(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setZczbhhzbapzbh(erpProductsMap.get(onhandQueryResponse.getCode()).getRegisterNo());

api-admin/src/main/resources/application-dev.properties

@@ -1,11 +1,11 @@
 # 本地环境
 server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-#spring.datasource.password=123456
+spring.datasource.password=123456
-spring.datasource.password=root
+#spring.datasource.password=root
 server.servlet.context-path=
 
 logging.level.com.glxp.api.admin.dao=debug

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -46,7 +46,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType
+        ,diType,productType
         )
         values
             (
@@ -72,7 +72,8 @@
             #{uuid},
             #{sjcpbm},
             #{versionNumber},
-            #{diType}
+            #{diType},
+            #{productType}
             )
     </insert>
 
@@ -82,7 +83,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType
+        ,diType,productType
         )
         values
 
@@ -111,7 +112,8 @@
             #{item.uuid},
             #{item.sjcpbm},
             #{item.versionNumber},
-            #{item.diType}
+            #{item.diType},
+            #{item.productType}
             )
         </foreach>
     </insert>
@@ -152,6 +154,8 @@
             <if test="ybbm != null">ybbm=#{ybbm},</if>
             <if test="measname != null">measname=#{measname},</if>
             <if test="diType != null">diType=#{diType},</if>
+            <if test="productType != null">productType=#{productType},</if>
+
         </trim>
         WHERE nameCode = #{nameCode}
     </update>

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -20,6 +20,7 @@
         basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,
         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,
         basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType
+        ,basic_products.productType
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml

@@ -16,6 +16,9 @@
             <if test="status != '' and status != null">
                 AND status = #{status}
             </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml

@@ -13,8 +13,11 @@
             <if test="inventoryName != '' and inventoryName != null">
                 AND inventoryName LIKE concat('%',#{inventoryName},'%')
             </if>
-            <if test="inventoryName != '' and inventoryName != null">
+            <if test="filterCount != '' and filterCount != null and filterCount==1">
-                AND inventoryName LIKE concat('%',#{inventoryName},'%')
+                AND count <![CDATA[ = ]]> 0
+            </if>
+            <if test="filterCount != '' and filterCount != null and filterCount==2">
+                AND count <![CDATA[ > ]]> 0
             </if>
             <if test="spec != '' and spec != null">
                 AND spec LIKE concat('%',#{spec},'%')
@@ -25,6 +28,9 @@
             <if test="manufactory != '' and manufactory != null">
                 AND manufactory LIKE concat('%',#{manufactory},'%')
             </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml

@@ -16,6 +16,9 @@
             <if test="status != '' and status != null">
                 AND status = #{status}
             </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml

@@ -16,6 +16,9 @@
             <if test="status != '' and status != null">
                 AND status = #{status}
             </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml

@@ -16,6 +16,9 @@
             <if test="status != '' and status != null">
                 AND status = #{status}
             </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
         </where>
         ORDER BY updateTime DESC
     </select>

api-admin/target/classes/META-INF/spring-configuration-metadata.json

@@ -1,38 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "cors",
-      "type": "com.glxp.api.admin.config.CorsConfig",
-      "sourceType": "com.glxp.api.admin.config.CorsConfig"
-    },
-    {
-      "name": "public-file",
-      "type": "com.glxp.api.admin.config.PublicFileUrlConfig",
-      "sourceType": "com.glxp.api.admin.config.PublicFileUrlConfig"
-    },
-    {
-      "name": "spring.datasource",
-      "type": "javax.sql.DataSource",
-      "sourceType": "com.glxp.api.admin.config.MasterDataSourceConfig",
-      "sourceMethod": "masterDataSource()"
-    }
-  ],
-  "properties": [
-    {
-      "name": "cors.allowed-headers",
-      "type": "java.lang.String",
-      "sourceType": "com.glxp.api.admin.config.CorsConfig"
-    },
-    {
-      "name": "cors.allowed-methods",
-      "type": "java.lang.String",
-      "sourceType": "com.glxp.api.admin.config.CorsConfig"
-    },
-    {
-      "name": "cors.allowed-origins",
-      "type": "java.lang.String",
-      "sourceType": "com.glxp.api.admin.config.CorsConfig"
-    }
-  ],
-  "hints": []
-}

api-admin/target/classes/application-dev.properties

@@ -1,26 +0,0 @@
-# 本地环境
-server.port=9991
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.username=root
-spring.datasource.password=123456
-#spring.datasource.password=mysql80
-server.servlet.context-path=
-
-logging.level.com.glxp.api.admin.dao=debug
-logging.level.com.glxp.api.admin.erp.second=debug
-
-#logback配置
-
-logging.path=output/logs
-# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称
-logging.file=D:/udi.log
-#UDI数据下载
-UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
-#UDI_SERVER_URL=http://139.9.178.73:8080/UDI_DL_Server
-#UCLOD服务
-#UCLOD_SERVER_URL=http://127.0.0.1:9997
-UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER
-
-
-

api-admin/target/classes/application.properties

@@ -1,8 +0,0 @@
-spring.profiles.active=dev
-
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-mybatis.config-location=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml
-
-spring.jmx.enabled=false