备份代码

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

@@ -227,13 +227,15 @@ public class AuthAdminController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         AuthAdmin curUser = getCustomerId();
-
-        CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId());
-        int max = customerInfoEntity.getUserMax();
-        int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
-        if (count >= max) {
-            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数");
+        if (curUser.getCustomerId() != 110) {
+            CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId());
+            int max = customerInfoEntity.getUserMax();
+            int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId());
+            if (count >= max) {
+                return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已超过最大用户数");
+            }
         }
+
         // 检查是否存在相同名称的管理员
         AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
         if (byUserName != null) {

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

@@ -173,7 +173,7 @@ public class UdiInfoExportLogController {
     @PostMapping("/udiwms/basic/udiinfo/deleteByStatus")
     public BaseResponse deleteByStatus(@RequestBody DeleteRequest deleteRequest) {
 
-        boolean b = basicExportService.deleteById(Integer.parseInt(deleteRequest.getId()));
+        boolean b = basicExportService.deleteById(deleteRequest.getId());
         if (b)
             return ResultVOUtils.success("删除成功！");
         else

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

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.controller.basic;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
@@ -21,6 +22,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
+import com.glxp.sale.admin.service.auth.CustomerService;
 import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
 import com.glxp.sale.admin.service.basic.BasicThirdSysService;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
@@ -34,10 +36,7 @@ import com.glxp.sale.admin.service.thrsys.ThrDataService;
 import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
 import com.glxp.sale.admin.thread.BasicUpdateProductService;
 import com.glxp.sale.admin.thread.UdiDlHttpClient;
-import com.glxp.sale.admin.util.CustomUtil;
-import com.glxp.sale.admin.util.DateUtil;
-import com.glxp.sale.admin.util.FilterUdiUtils;
-import com.glxp.sale.admin.util.HttpClient;
+import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@@ -86,7 +85,10 @@ public class UdiRelevanceController {
 
     @Resource
     private CompanyProductRelevanceService companyProductRelevanceService;
-
+    @Resource
+    CustomerService customerService;
+    @Resource
+    RedisUtil redisUtil;
 
     //客户端器械信息下载
     @AuthRuleAnnotation("")
@@ -108,6 +110,25 @@ public class UdiRelevanceController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    //客户端器械信息下载
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/udirel/mutil/download")
+    public BaseResponse downloadMutilProducts(FilterUdiInfoRequest filterUdiInfoRequest,
+                                              BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(filterUdiInfoRequest.getNameCode());
+        PageInfo<UdiRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(udiRelevanceResponses);
+        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(udiRelevanceResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
     //器械信息维护首页
     @AuthRuleAnnotation("")
@@ -284,6 +305,7 @@ public class UdiRelevanceController {
                     }
                 }
                 if (combineRequest.getRelId() != null && !combineRequest.getRelId().equals("")) {
+                    //修改
 
                     //判断DI是否被使用，若使用则新增一条
                     UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());
@@ -317,9 +339,15 @@ public class UdiRelevanceController {
                 } else {
 
                     udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
-                    udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
-                    udiRelevanceEntity.setUuid(key);
-                    udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+                    UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(key, combineRequest.getThirdId());
+                    if (temp == null) {
+                        udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
+                        udiRelevanceEntity.setUuid(key);
+                        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+                    } else {
+                        return ResultVOUtils.error(500, "重复关联！");
+                    }
+
                 }
 
 
@@ -386,8 +414,15 @@ public class UdiRelevanceController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/addErp")
     public BaseResponse addErp(@RequestBody CombineRequest combineRequest) {
-        String errMsg = basicUpdateProductService.addLocalProduct(combineRequest);
-        if (errMsg == null)
+        String errMsg = null;
+
+        combineRequest.setCustomerId(customerService.getCustomerId());
+        if (!combineRequest.getSupEnable()) {
+            errMsg = basicUpdateProductService.addLocalProduct(combineRequest);
+        } else {
+            errMsg = basicUpdateProductService.addSupLocalProduct(combineRequest);
+        }
+        if (StrUtil.isEmpty(errMsg))
             return ResultVOUtils.success("添加成功！");
         else {
             return ResultVOUtils.error(500, errMsg);
@@ -400,7 +435,12 @@ public class UdiRelevanceController {
     @PostMapping("/udi/udirel/addAllErp")
     public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) {
 
-
+        String status = (String) redisUtil.get("load_thrid_basic");
+        if (status == null || !status.equals("process")) {
+            redisUtil.set("load_thrid_basic", "process", 15 * 60);
+        } else {
+            return ResultVOUtils.error(500, "当前正在导入，请稍后刷新重试");
+        }
         if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
             basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, true);
         } else {

api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.controller.info;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.controller.basic.BasicUnitMaintainController;
@@ -85,7 +86,9 @@ public class CompanyProductRelevanceController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
+        if (StrUtil.isEmpty(filterCompanyProductRelevanceRequest.getUdiRlIdFk())) {
+            return ResultVOUtils.error(500, "请先选择产品！");
+        }
         List<CompanyProductRelevanceEntity> companyProductRelevanceEntities =
                 companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
 

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

@@ -363,7 +363,28 @@ public class StockQRCodeTextController {
 
         /*打印订单*/
         List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
+
+
         if (list != null && list.size() > 0) {
+
+            SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
+            SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
+            systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
+            systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
+            List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
+            if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
+
+            SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
+            SystemPDFTemplateEntity systemPDFTemplateEntity =
+                    systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
+
+            systemPDFModuleEntity.setRemark1(systemPDFTemplateRelevanceResponse.getRemark1());
+            systemPDFModuleEntity.setRemark2(systemPDFTemplateRelevanceResponse.getRemark2());
+            systemPDFModuleEntity.setRemark3(systemPDFTemplateRelevanceResponse.getRemark3());
+
+            if (systemPDFTemplateEntity == null) return;
+
+
             int index = 1;
             CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID));//Long.parseLong(list.get(0).getCustomerId())
             for (StockOrderPrintEntity stockOrderPrintEntity : list) {
@@ -378,18 +399,13 @@ public class StockQRCodeTextController {
 //                stockOrderPrintEntity.setTotalPriceWord("18888");
                 stockOrderPrintEntity.setCorpName(stockOrderPrintEntity.getCorpName());
                 stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
+                stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1());
+                stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
+                stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
                 index++;
 //                stockOrderPrintResponses.add(stockOrderPrintResponse);
             }
-            SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
-            SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
-            systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
-            systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
-            List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
-            if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
-            SystemPDFTemplateEntity systemPDFTemplateEntity =
-                    systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponses.get(0).getTemplateId()));
-            if (systemPDFTemplateEntity == null) return;
+
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("data", list);
             JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");

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

@@ -256,9 +256,15 @@ public class WareHouseController {
     @AuthRuleAnnotation("")
     @GetMapping("warehouse/inout/deleteCodesTempById")
     public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) {
-        WarehouseEntity warehouseEntity = new WarehouseEntity();
-        warehouseEntity.setId(id);
-        codesTempService.deleteCodesTempById(warehouseEntity);
+
+        WarehouseEntity warehouseEntity = codesTempService.selectById(id);
+        if (warehouseEntity.getCount() != null && warehouseEntity.getCount() > 1) {
+            warehouseEntity.setCount(warehouseEntity.getCount() - 1);
+            codesTempService.updateById(warehouseEntity);
+        } else {
+            codesTempService.deleteCodesTempById(warehouseEntity);
+
+        }
         return ResultVOUtils.success();
     }
 
@@ -380,9 +386,7 @@ public class WareHouseController {
     }
 
     public BaseResponse checkRelId(WarehouseEntity warehouseEntity) {
-        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-        filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
-        List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
+        List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
         if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
             warehouseEntity.setRelId(null);
             warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
@@ -412,7 +416,7 @@ public class WareHouseController {
             String supId = ioTransInoutService.checkExitSup(warehouseEntity.getRelId());
             if (supId == null || "MUTI".equals(supId)) {
                 warehouseEntity.setSupId(null);
-                BaseResponse baseResponse = ResultVOUtils.error(503, "该产品绑定多供应商,请指定对应的供应商");
+                BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商或绑定多个供应商,请指定对应的供应商");
                 baseResponse.setData(warehouseEntity);
                 return baseResponse;
             } else {
@@ -432,6 +436,14 @@ public class WareHouseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         boolean b = codesTempService.update(warehouseEntity);
+
+        if (warehouseEntity.getRelId() != null) {
+            warehouseEntity = codesTempService.selectById(warehouseEntity.getId());
+            BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(warehouseEntity.getAction());
+            BaseResponse baseResponse = checkSupId(bussinessTypeEntity, warehouseEntity);
+            if (baseResponse != null)
+                return baseResponse;
+        }
         return ResultVOUtils.success("绑定成功");
     }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/InoutUtils.java

@@ -186,7 +186,9 @@ public class InoutUtils {
 
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(prefix);
         if (udiRelevanceResponse == null) {
-            udiRelevanceResponse = udiRelevanceService.selectByMainId(prefix);
+            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectByMainId(prefix);
+            if (!udiRelevanceResponses.isEmpty())
+                udiRelevanceResponse = udiRelevanceResponses.get(0);
         }
         if (udiRelevanceResponse == null) {
             udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, code);

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -31,6 +31,7 @@ import com.glxp.sale.admin.service.inventory.InvProductDetailService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.service.thrsys.ThrInvWarehouseService;
+import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.admin.util.DateUtil;
 import com.glxp.sale.admin.util.FileUtils;
 import com.glxp.sale.common.enums.ResultEnum;
@@ -313,6 +314,7 @@ public class InvWarehouseController {
         basicExportStatusEntity.setType(BasicProcessStatus.BASIC_INV);
         basicExportStatusEntity.setUpdateTime(new Date());
         basicExportStatusEntity.setIdDatas(JSON.toJSON(results).toString());
+        basicExportStatusEntity.setId(CustomUtil.getId());
         basicExportService.insertExportStatus(basicExportStatusEntity);
         return ResultVOUtils.success("上传成功，等待中继服务下载！");
     }

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

@@ -75,27 +75,27 @@ public class ThrInvWarehouseController {
             thrInvWarehouseEntity.setPid(0); // 默认设置
             FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
             filterThrInvWarehouseRequest.setPid(thrInvWarehouseEntity.getPid());
-            ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest);
+//            ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest);
 //            if(codeEntity == null)
-            if (codeEntity == null) {
-                int code = Integer.parseInt("1") * 1000;
-                thrInvWarehouseEntity.setCode(code + "");
-            } else {
-                thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
-            }
+//            if (codeEntity == null) {
+//                int code = Integer.parseInt("1") * 1000;
+//                thrInvWarehouseEntity.setCode(code + "");
+//            } else {
+//                thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
+//            }
 //            thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
         } else {//货位
 
             FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
             filterThrInvWarehouseRequest.setPid(thrInvWarehouseEntity.getPid());
-            ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest);
+//            ThrInvWarehouseEntity codeEntity = thrInvWarehouseService.selectMaxCode(filterThrInvWarehouseRequest);
             ThrInvWarehouseEntity pEntity = thrInvWarehouseService.selectById(thrInvWarehouseEntity.getPid() + "");
-            if (codeEntity == null) {
-                int code = Integer.parseInt(pEntity.getCode()) * 1000;
-                thrInvWarehouseEntity.setCode(code + "");
-            } else {
-                thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
-            }
+//            if (codeEntity == null) {
+//                int code = Integer.parseInt(pEntity.getCode()) * 1000;
+//                thrInvWarehouseEntity.setCode(code + "");
+//            } else {
+//                thrInvWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
+//            }
             thrInvWarehouseEntity.setAdvanceType(pEntity.getAdvanceType());
             thrInvWarehouseEntity.setLevel(pEntity.getLevel());
             thrInvWarehouseEntity.setPcode(pEntity.getPcode());

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

@@ -15,7 +15,7 @@ public interface BasicExportDao {
 
     boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
 
-    boolean deleteById(@Param("id") Integer id);
+    boolean deleteById(@Param("id") String id);
 
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
 

api-admin/src/main/java/com/glxp/sale/admin/dao/inout/CodesTempDao.java

@@ -10,6 +10,8 @@ import java.util.List;
 @Mapper
 public interface CodesTempDao {
 
+    WarehouseEntity selectById(@Param("id") Long id);
+
     int insertCodesTemp(@Param("codes") List<WarehouseEntity> warehouseEntities);
 
     int insertCodesTempSingle(WarehouseEntity warehouseEntitie);

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java

@@ -2,10 +2,12 @@ package com.glxp.sale.admin.dao.inventory;
 
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+@Mapper
 public interface InvWarehouseDao {
 
     List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 @Data
 public class BasicExportStatusEntity {
-    private Integer id;
+    private String id;
     private String idDatas;
     private Integer status;
     private Integer type;

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

@@ -41,6 +41,7 @@ public class UdiInfoEntity {
     private String scbssfbhxlh;
     private String scbssfbhscrq;
     private String scbssfbhsxrq;
+    private String cpms;
 
 
     //本地生成信息

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

@@ -30,6 +30,7 @@ public class UdiRelevanceEntity {
     private Integer lockStatus;
     private String udplatCode;
     private Boolean isAdavence;
+    private String supName;
 
     public Integer getLockStatus() {
         if (lockStatus == null)

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java

@@ -39,4 +39,7 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String index;
     private String totalPriceWord;
     private String orderName;
+    private String remark1;
+    private String remark2;
+    private String remark3;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java

@@ -18,5 +18,6 @@ public class CombineRequest {
     private Boolean isRlInv;
     private FilterErpGoodsRequest query;
     private String erpId;
-
+    private Long customerId;
+    private Boolean supEnable;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterErpGoodsRequest.java

@@ -12,6 +12,7 @@ public class FilterErpGoodsRequest extends ListPageRequest {
     private String registerNo;  //注册证号
     private String manufactory; //生产厂家
     private String thirdSys;
+    private String supName;
     private Boolean isDownThrSys;
 }
 

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -54,6 +54,8 @@ public class FilterUdiInfoRequest extends ListPageRequest {
 
     private Boolean isDisable;
     List<String> relIds;
+    private String uniqueNameCode;
+    private String supName;
 
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemPDFModuleSaveRequest.java

@@ -17,4 +17,7 @@ public class SystemPDFModuleSaveRequest {
     private Date update_time;
     private String templateDlUrl;
     private Integer templateType;
+    private String remark1;
+    private String remark2;
+    private String remark3;
 }

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

@@ -60,6 +60,8 @@ public class UdiRelevanceResponse {
     private String scbssfbhxlh;
     private String scbssfbhscrq;
     private String scbssfbhsxrq;
+    private String cpms;
+    private String supName;
 
 
     public int getBhzxxsbzsl() {

api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicExportService.java

@@ -13,7 +13,7 @@ public interface BasicExportService {
 
     boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
 
-    boolean deleteById(Integer id);
+    boolean deleteById(String id);
 
     boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java

@@ -38,7 +38,7 @@ public interface UdiRelevanceService {
 
     UdiRelevanceEntity selectUpdateByThirdId(String thirdId);
 
-    UdiRelevanceResponse selectByMainId(String mainId);
+    List<UdiRelevanceResponse> selectByMainId(String mainId);
 
     UdiRelevanceEntity selectUpteaByAll(String uuid, String thirdId);
 

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

@@ -35,7 +35,7 @@ public class BasicExportServiceImpl implements BasicExportService {
     }
 
     @Override
-    public boolean deleteById(Integer id) {
+    public boolean deleteById(String id) {
         return basicExportDao.deleteById(id);
     }
 

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

@@ -1,16 +1,24 @@
 package com.glxp.sale.admin.service.basic.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
 import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
+import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
+import com.glxp.sale.admin.httpclient.UdiDlHttpClient;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.BasicThirdSysService;
+import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
+import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.FilterUdiUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -20,6 +28,8 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     UdiRelevanceDao udiRelevanceDao;
     @Resource
     BasicThirdSysService basicThirdSysService;
+    @Resource
+    UdiInfoService udiInfoService;
 
     @Override
     public List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest) {
@@ -35,6 +45,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
         return data;
     }
 
+
     @Override
     public List<UdiRelevanceEntity> filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest) {
 
@@ -45,7 +56,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     @Override
     public UdiRelevanceResponse selectByNameCode(String nameCode) {
         FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-        filterUdiInfoRequest.setNameCode(nameCode);
+        filterUdiInfoRequest.setUniqueNameCode(nameCode);
         List<UdiRelevanceResponse> udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest);
         if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0)
             return udiRelevanceResponses.get(0);
@@ -54,10 +65,15 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
 
     @Override
     public List<UdiRelevanceResponse> selectAllByNameCode(String nameCode) {
-        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-        filterUdiInfoRequest.setNameCode(nameCode);
-        List<UdiRelevanceResponse> udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest);
-        return udiRelevanceResponses;
+        List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
+        UdiRelevanceResponse udiRelevanceResponse = selectByNameCode(nameCode);
+        if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {
+            return selectByMainId(nameCode);
+        } else {
+            udiRelevanceResponses.add(udiRelevanceResponse);
+            return udiRelevanceResponses;
+        }
+
     }
 
     @Override
@@ -161,13 +177,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     }
 
     @Override
-    public UdiRelevanceResponse selectByMainId(String mainId) {
+    public List<UdiRelevanceResponse> selectByMainId(String mainId) {
         FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
         filterUdiInfoRequest.setMainId(mainId);
         List<UdiRelevanceResponse> udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest);
-        if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0)
-            return udiRelevanceResponses.get(0);
-        return null;
+        return udiRelevanceResponses;
     }
 
     @Override

api-admin/src/main/java/com/glxp/sale/admin/service/inout/CodesTempService.java

@@ -7,12 +7,14 @@ import java.util.List;
 
 public interface CodesTempService {
 
+    WarehouseEntity selectById(Long id);
 
     int insertCodesTemp(List<WarehouseEntity> warehouseEntities);
 
     int insertCodesTempSingle(WarehouseEntity warehouseEntitie);
 
     int updateById(WarehouseEntity warehouseEntitie);
+
     boolean update(WarehouseEntity warehouseEntity);
 
     boolean updateByOrderId(WarehouseEntity warehouseEntity);

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesTempServiceImpl.java

@@ -18,6 +18,11 @@ public class CodesTempServiceImpl implements CodesTempService {
     @Resource
     CodesTempDao codesTempDao;
 
+    @Override
+    public WarehouseEntity selectById(Long id) {
+        return codesTempDao.selectById(id);
+    }
+
     @Override
     public int insertCodesTemp(List<WarehouseEntity> warehouseEntities) {
         return codesTempDao.insertCodesTemp(warehouseEntities);

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

@@ -18,6 +18,7 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.admin.util.DateUtil;
+import com.glxp.sale.admin.util.RedisUtil;
 import com.glxp.sale.common.res.BaseResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -44,6 +45,9 @@ public class BasicBackUpdateProductService {
     @Resource
     private ErpBasicClient erpBasicClient;
 
+    @Resource
+    RedisUtil redisUtil;
+
     //定时或一键下载更新全部线上产品信息
     @Async
     public void addAllProducts(FilterErpGoodsRequest filterErpGoodsRequest, String productUrl, String onHandUrl, String thirdSysId, Boolean isEnable) {
@@ -158,6 +162,10 @@ public class BasicBackUpdateProductService {
     //定时或一键下载更新本地所有产品信息
     @Async
     public void loadLocal(FilterErpGoodsRequest filterErpGoodsRequest, String thirdSysId, String onHandUrl, Boolean isEnable) {
+
+
+
+
         if (filterErpGoodsRequest == null) {
             filterErpGoodsRequest = new FilterErpGoodsRequest();
         }
@@ -239,7 +247,7 @@ public class BasicBackUpdateProductService {
 
             }
         }
-
+        redisUtil.set("load_thrid_basic", "finish", 15 * 60);
 
     }
 

api-admin/src/main/java/com/glxp/sale/admin/thread/BasicGenExcelService.java

@@ -27,6 +27,7 @@ import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.*;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
+import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.admin.util.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -124,6 +125,7 @@ public class BasicGenExcelService {
         basicExportStatusEntity.setType(BasicProcessStatus.BASIC_CORP);
         basicExportStatusEntity.setUpdateTime(new Date());
         basicExportStatusEntity.setIdDatas(JSON.toJSON(results).toString());
+        basicExportStatusEntity.setId(CustomUtil.getId());
         basicExportService.insertExportStatus(basicExportStatusEntity);
         corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
         corpExportLogService.updateCorpExportLog(corpExportLogEntity);
@@ -451,6 +453,7 @@ public class BasicGenExcelService {
         basicExportStatusEntity.setType(BasicProcessStatus.BASIC_UDI);
         basicExportStatusEntity.setUpdateTime(new Date());
         basicExportStatusEntity.setIdDatas(JSON.toJSON(results).toString());
+        basicExportStatusEntity.setId(CustomUtil.getId());
         basicExportService.insertExportStatus(basicExportStatusEntity);
         udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
         udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);

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

@@ -6,18 +6,21 @@ import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
+import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.entity.udid.UdiEntity;
 import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.ErpProductsResponse;
 import com.glxp.sale.admin.service.basic.BasicThirdSysService;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
+import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.admin.util.DateUtil;
@@ -51,7 +54,10 @@ public class BasicUpdateProductService {
     BasicThirdSysService basicThirdSysService;
     @Resource
     private ErpBasicClient erpBasicClient;
-
+    @Resource
+    CompanyService companyService;
+    @Resource
+    private CompanyProductsRelService companyProductsRelService;
 
     public String addProduct(CombineRequest combineRequest, String url) {
         String errMsg = null;
@@ -119,7 +125,76 @@ public class BasicUpdateProductService {
     }
 
     public String addLocalProduct(CombineRequest combineRequest) {
-        String errMsg = null;
+        String errMsg = "";
+        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.selectThrProducts(filterThrProductsRequest);
+                if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
+                    ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
+                    ErpProductsResponse erpProductsResponse = new ErpProductsResponse();
+                    BeanUtils.copyProperties(thrProductsEntity, erpProductsResponse);
+                    UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(thrProductsEntity.getCode());
+                    if (udiInfoEntity == null) {
+                        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(1);
+                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                    }
+                    udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
+                    udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
+                    udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());
+
+                    BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
+                    String mainSys = basicThirdSysEntity.getThirdId();
+                    if (mainSys.equals("thirdId")) {
+                        udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId());
+                        udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName());
+                    } else if (mainSys.equals("thirdId1")) {
+                        udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1());
+                        udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1());
+                    } else if (mainSys.equals("thirdId2")) {
+                        udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2());
+                        udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2());
+                    } else if (mainSys.equals("thirdId3")) {
+                        udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3());
+                        udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3());
+                    } else if (mainSys.equals("thirdId4")) {
+                        udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
+                        udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4());
+                    }
+                    UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectUpteaByAll(udiRelevanceEntity1.getUuid(), udiRelevanceEntity1.getMainId());
+                    if (udiRelevanceEntity == null) {
+                        udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
+                    } else {
+                        errMsg = errMsg + "产品编码:" + udiRelevanceEntity1.getMainId() + "已存在!;";
+                    }
+                    udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
+                }
+            }
+        }
+        return errMsg;
+    }
+
+    public String addSupLocalProduct(CombineRequest combineRequest) {
+        String errMsg = "";
         List<String> inventoryCodes = new ArrayList<>();
         if (combineRequest.getThirdIds() == null)
             inventoryCodes.add(combineRequest.getThirdId());
@@ -127,6 +202,7 @@ public class BasicUpdateProductService {
             inventoryCodes = combineRequest.getThirdIds();
         }
         if (inventoryCodes.size() > 0) {
+            List<String> rlIds = new ArrayList<>();
             for (String inventoryCode : inventoryCodes) {
                 UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
                 udiRelevanceEntity1.setThirdId(inventoryCode);
@@ -137,21 +213,25 @@ public class BasicUpdateProductService {
                     ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
                     ErpProductsResponse erpProductsResponse = new ErpProductsResponse();
                     BeanUtils.copyProperties(thrProductsEntity, erpProductsResponse);
-                    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(1);
-                    udiInfoService.insertUdiInfo(udiInfoEntity);
+                    UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(thrProductsEntity.getCode());
+                    if (udiInfoEntity == null) {
+                        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(1);
+                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                    }
                     udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                     udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
                     udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());
+                    udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
 
                     BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
                     String mainSys = basicThirdSysEntity.getThirdId();
@@ -171,9 +251,23 @@ public class BasicUpdateProductService {
                         udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
                         udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4());
                     }
-                    udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
+                    UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectUpteaByAll(udiRelevanceEntity1.getUuid(), udiRelevanceEntity1.getMainId());
+                    if (udiRelevanceEntity == null) {
+                        udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
+                    } else {
+                        errMsg = errMsg + "产品编码:" + udiRelevanceEntity1.getMainId() + "已存在,将直接选入！;";
+                    }
+                    UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(udiRelevanceEntity1.getUuid(), udiRelevanceEntity1.getMainId());
+                    rlIds.add(temp.getId());
+
                 }
             }
+            CompanyEntity companyEntity = companyService.findCompany(combineRequest.getCustomerId());
+            UdiInfoExportRequest udiInfoExportRequest = new UdiInfoExportRequest();
+            udiInfoExportRequest.setRlIds(rlIds);
+            udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk());
+            udiInfoExportRequest.setCustomerId(combineRequest.getCustomerId());
+            companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
         }
         return errMsg;
     }

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -339,16 +339,6 @@ public class IoTransInoutService {
             }
         }
 
-
-//        if (!Constant.SYSTEM_CUSTOMER_ID.equals(orderEntity.getFromCorpId())) {
-//            BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(orderEntity.getFromCorpId());
-//            if (basicUnitMaintainEntity == null) {
-//                orderEntity.setRemark("往来单位不存在！");
-//                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
-//                orderService.updateOrder(orderEntity);
-//                return;
-//            }
-//        }
         WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
         warehouseQueryRequest.setOrderId(orderEntity.getId());
         List<WarehouseEntity> filterList = codesTempService.findByOrderId(warehouseQueryRequest);
@@ -425,6 +415,7 @@ public class IoTransInoutService {
                 return;
             }
 
+            //产品是否可以以使用单元入库
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
             if (udiRelevanceResponses.size() == 1) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
@@ -476,9 +467,7 @@ public class IoTransInoutService {
         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
         //为所有条码关联基础信息关联表ID
         for (WarehouseEntity warehouseEntity : warehouseEntityList) {
-            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-            filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
-            List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
+            List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectAllByNameCode(warehouseEntity.getNameCode());
 
             //默认或已选中供应商
             String originSupId = checkOriginExitSup(bussinessTypeEntity, warehouseEntity);

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

@@ -23,8 +23,9 @@
     <insert id="insertExportStatus" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.basic.BasicExportStatusEntity">
         replace
-        INTO basic_export_status(idDatas,status,type,updateTime)
+        INTO basic_export_status(id,idDatas,status,type,updateTime)
         values(
+        #{id},
         #{idDatas},
         #{status},
         #{type},

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

@@ -40,7 +40,7 @@
         basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq
+        basic_products.scbssfbhsxrq,basic_products.cpms
         FROM (company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@@ -124,7 +124,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq)
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms)
         values
             (
         #{id},
@@ -155,7 +155,7 @@
         #{scbssfbhph},
         #{scbssfbhxlh},
         #{scbssfbhscrq},
-        #{scbssfbhsxrq}
+        #{scbssfbhsxrq},#{cpms}
         )
     </insert>
 
@@ -165,7 +165,7 @@
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
-        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq
+        ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms
         )
         values
 
@@ -197,7 +197,7 @@
             #{item.diType},#{item.productType}, #{item.scbssfbhph},
             #{item.scbssfbhxlh},
             #{item.scbssfbhscrq},
-            #{item.scbssfbhsxrq}
+            #{item.scbssfbhsxrq},#{item.cpms}
             )
         </foreach>
     </insert>
@@ -247,6 +247,8 @@
             <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
             <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
             <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
+            <if test="cpms != null">cpms=#{cpms},</if>
+
         </trim>
         WHERE nameCode = #{nameCode}
     </update>
@@ -264,7 +266,7 @@
         (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
         deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
         ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
-        productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq) values
+        productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms) values
         <foreach collection="udiInfoEntities" item="item" index="index" separator=",">
             (#{item.id},
             #{item.nameCode},
@@ -298,7 +300,7 @@
             #{item.productType}, #{item.scbssfbhph},
             #{item.scbssfbhxlh},
             #{item.scbssfbhscrq},
-            #{item.scbssfbhsxrq})
+            #{item.scbssfbhsxrq},#{item.cpms})
         </foreach>
     </insert>
 </mapper>

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

@@ -24,16 +24,19 @@
         basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq
+        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%',#{supName},'%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode LIKE concat(#{nameCode},'%')
@@ -76,6 +79,10 @@
             <if test="isAdavence != '' and isAdavence != null">
                 AND isAdavence = #{isAdavence}
             </if>
+            <if test="uniqueNameCode != '' and uniqueNameCode != null">
+                AND nameCode = #{uniqueNameCode}
+            </if>
+
 
         </where>
         ORDER BY updateTime DESC
@@ -101,7 +108,7 @@
         basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq
+        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName
         FROM basic_products
         right JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid
@@ -109,6 +116,9 @@
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%')
             </if>
+            <if test="supName != '' and supName != null">
+                AND supName LIKE concat('%',#{supName},'%')
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
             </if>
@@ -268,7 +278,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName
         )
         values
             (
@@ -296,7 +306,8 @@
         #{mainName},
         #{lockStatus},
         #{udplatCode},
-        #{isAdavence}
+        #{isAdavence},
+        #{supName}
         )
     </insert>
 
@@ -309,7 +320,7 @@
         (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
-        ,mainId,mainName,lockStatus,udplatCode,isAdavence
+        ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName
         )
         values
             (
@@ -337,7 +348,8 @@
         #{mainName},
         #{lockStatus},
         #{udplatCode},
-        #{isAdavence}
+        #{isAdavence},
+        #{supName}
         )
     </insert>
 
@@ -385,7 +397,7 @@
             <if test="mainName != null">mainName=#{mainName},</if>
             <if test="udplatCode != null">udplatCode=#{udplatCode},</if>
             <if test="isAdavence != null">isAdavence=#{isAdavence},</if>
-
+            <if test="supName != null">supName=#{supName},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -409,7 +421,7 @@
     <insert id="importUdiRelevance" parameterType="java.util.List">
         replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3,
         thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
-        measname, isDisable, mainId, mainName, udplatCode)
+        measname, isDisable, mainId, mainName, udplatCode,supName)
         values
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
             (#{item.id},
@@ -433,7 +445,7 @@
             #{item.isDisable},
             #{item.mainId},
             #{item.mainName},
-            #{item.udplatCode})
+            #{item.udplatCode},#{item.supName})
         </foreach>
     </insert>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml

@@ -46,7 +46,7 @@
         basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
-        basic_products.scbssfbhsxrq
+        basic_products.scbssfbhsxrq,basic_products.cpms
         FROM company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id

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

@@ -2,7 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.sale.admin.dao.inout.CodesTempDao">
-
+    <select id="selectById" parameterType="java.lang.Long"
+            resultType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
+        select *
+        FROM io_codes_temp
+        WHERE id = #{id}
+    </select>
 
     <insert id="insertCodesTemp" parameterType="java.util.List">
         INSERT INTO io_codes_temp
@@ -38,7 +43,7 @@
             parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
         INSERT INTO io_codes_temp(action, mainAction, code, corpOrderId, actor, actDate,
                                   fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
-                                  count, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode,relId)
+                                  count, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
         values (#{action},
                 #{mainAction},
                 #{code},
@@ -52,7 +57,7 @@
                 #{produceDate},
                 #{expireDate},
                 #{serialNo},
-                #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode},#{relId})
+                #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
     </insert>
 
     <select id="findByOrderId" parameterType="com.glxp.sale.admin.req.inout.WarehouseQueryRequest"

scripts/vue-admin.sql

@@ -29,6 +29,8 @@ scbssfbhph VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含批号',
 scbssfbhxlh VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含序列号',
 scbssfbhscrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含生产日期',
 scbssfbhsxrq VARCHAR(10) NULL DEFAULT NULL COMMENT '是否包含失效日期'
+
+
 );