基础信息导入导出，bug修复，业务单据bug修复

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java

@@ -255,7 +255,6 @@ public class StockOrderDetailController {
             companyProductRelevanceRequest.setDiType(1);
             companyProductRelevanceRequest.setCustomerId(getCustomerId());
             List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
-            if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId());
             filterUdiInfoRequest.setDiType(1);
@@ -266,8 +265,7 @@ public class StockOrderDetailController {
                 companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId());
                 companyProductRelevanceResponses.add(companyProductRelevanceResponse);
             }
-            } else
+//                companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
-                companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
             if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
                 CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
                 StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -320,7 +320,6 @@ public class WareHouseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        try {
         String code = addOrderRequest.getCode();
         if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@@ -387,9 +386,6 @@ public class WareHouseController {
         }
 
         return ResultVOUtils.success(orderId);
-        } catch (Exception e) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }
 
     }
 

api-admin/src/main/java/com/glxp/api/admin/dao/basic/CompanyProductRelevanceDao.java

@@ -31,6 +31,8 @@ public interface CompanyProductRelevanceDao {
 
     boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
 
+    boolean importCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity);
+
     boolean deleteById(String id);
 
     boolean deleteByRlId(String id);

api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java

@@ -33,4 +33,7 @@ public class OrderFilterRequest extends ListPageRequest {
 
     private Integer userId;
     private String locStorageCode;
+
+    private Integer unionCtrStatus;
+
 }

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

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.res.basic;
 
+import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
@@ -24,6 +25,9 @@ public class UdiRelevanceExportJsonResponse {
     public UdiRelevanceExportJsonResponse() {
         this.udiInfoEntities = new ArrayList<>();
         this.udiRelevanceEntities = new ArrayList<>();
+        this.companyProductRelevanceEntities = new ArrayList<>();
         this.thrProductsEntities = new ArrayList<>();
     }
+
+    private List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java

@@ -2,19 +2,14 @@ package com.glxp.api.admin.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.github.pagehelper.PageHelper;
-import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao;
+import com.glxp.api.admin.dao.basic.*;
-import com.glxp.api.admin.dao.basic.UdiInfoDao;
-import com.glxp.api.admin.dao.basic.UdiInfoImportDetailDao;
-import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
 import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
-import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
+import com.glxp.api.admin.entity.basic.*;
-import com.glxp.api.admin.entity.basic.UdiInfoEntity;
-import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity;
-import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
 import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
+import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -85,6 +80,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
     public void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) {
         if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) {
 
+            //基础表导入
             SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
             if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) {
                 try {
@@ -102,6 +98,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
 
         }
 
+        //关联表导入
         if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) {
             SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
             try {
@@ -116,6 +113,7 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
 //            udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities());
         }
 
+        //第三方产品信息导入
         if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) {
 
             SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
@@ -131,5 +129,21 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
 
 //            thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities());
         }
+
+        //供应商关联表导入
+        if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities())) {
+
+            SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
+            try {
+                List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = udiRelevanceExportJsonResponse.getCompanyProductRelevanceEntities();
+                CompanyProductRelevanceDao mapper = batchSession.getMapper(CompanyProductRelevanceDao.class);
+                for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
+                    mapper.importCompanyProductRelevance(companyProductRelevanceEntity);
+                }
+                batchSession.commit();
+            } catch (Exception e) {
+            }
+        }
+
     }
 }

api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml

@@ -50,7 +50,7 @@
                 #{produceDate},
                 #{expireDate},
                 #{serialNo},
-                #{count}, #{nameCode}, #{relId}, #{status}, #{supId}, #{item.invStorageCode}, #{item.invWarehouseCode},
+                #{count}, #{nameCode}, #{relId}, #{status}, #{supId}, #{invStorageCode}, #{invWarehouseCode},
                 #{locStorageCode})
     </insert>