首营功能提交

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

@@ -388,8 +388,8 @@ public class OrderDetailController {
                             BeanUtils.copyProperties(erpOrderEntity, item);
                             item.setCode(codeDetaiEntity.getCode());
                             item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService));
-                            item.setReCount(erpOrderEntity.getReCount());
+                            item.setReCount(codeDetaiEntity.getCount());
-                            item.setErpCount(erpOrderEntity.getErpCount());
+                            item.setErpCount(codeDetaiEntity.getCount());
                             item.setCodeId(codeDetaiEntity.getId().intValue());
                             item.setSerialNo(codeDetaiEntity.getSerialNo());
                             resultList.add(item);

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java

@@ -1,12 +1,17 @@
 package com.glxp.sale.admin.controller.purechase;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest;
 import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
+import com.glxp.sale.admin.req.purchase.PostSelCertRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.purchase.SupCertService;
@@ -45,6 +50,10 @@ public class SupCertController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        if (StrUtil.isEmpty(filterSupCertRequest.getCustomerId())) {
+            filterSupCertRequest.setCustomerId(getCustomerId());
+        }
         List<SupCertEntity> supCertEntityList
                 = supCertService.filterCompanyCert(filterSupCertRequest);
         PageInfo<SupCertEntity> pageInfo;
@@ -78,6 +87,32 @@ public class SupCertController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/info/selectAllCert")
+    public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) {
+        String customerId = getCustomerId();
+        if (CollUtil.isEmpty(postSelCertRequest.getSupCertSetEntities())) {
+            return ResultVOUtils.error(500, "请选入资质证书！");
+        }
+        if (postSelCertRequest.getCertType() == null) {
+            return ResultVOUtils.error(500, "参数错误！");
+        }
+        for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
+            SupCertEntity supCertEntity = new SupCertEntity();
+            supCertEntity.setName(supCertSetEntity.getName());
+            supCertEntity.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk());
+            supCertEntity.setProductIdFk(postSelCertRequest.getProductIdFk());
+            supCertEntity.setCustomerId(customerId);
+            supCertEntity.setType(postSelCertRequest.getCertType());
+            supCertEntity.setCreateTime(new Date());
+            supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
+            supCertEntity.setUpdateTime(new Date());
+            boolean b = supCertService.insertCompanyCert(supCertEntity);
+        }
+        return ResultVOUtils.success("成功");
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("/sale/sup/cert/audit")
     public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) {

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java

@@ -0,0 +1,77 @@
+package com.glxp.sale.admin.controller.purechase;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
+import com.glxp.sale.admin.req.inout.DeleteRequest;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
+import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.service.purchase.SupCertSetService;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class SupCertSetController {
+
+    @Resource
+    private SupCertSetService supCertSetService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/sup/cert/set/filter")
+    public BaseResponse filterCertSet(FilterCertSetsRequest filterCertSetsRequest,
+                                      BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<SupCertSetEntity> supCertEntityList
+                = supCertSetService.filterCertSets(filterCertSetsRequest);
+        PageInfo<SupCertSetEntity> pageInfo;
+        pageInfo = new PageInfo<>(supCertEntityList);
+        PageSimpleResponse<SupCertSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(supCertEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/cert/set/add")
+    public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
+        if (supCertSetEntity == null) {
+            supCertSetEntity = new SupCertSetEntity();
+        }
+        supCertSetEntity.setUpdateTime(new Date());
+        boolean b = supCertSetService.insertCertSet(supCertSetEntity);
+        return ResultVOUtils.success("添加成功！");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/cert/set/update")
+    public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
+
+        boolean b = supCertSetService.updateCertSet(supCertSetEntity);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/cert/set/delete")
+    public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) {
+
+        boolean b = supCertSetService.deleteById(deleteRequest.getId());
+        return ResultVOUtils.success("删除成功！");
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.controller.purechase;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
@@ -9,21 +10,25 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.auth.CustomerContactEntity;
 import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
 import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
+import com.glxp.sale.admin.entity.purchase.SupProductEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.info.DeleteRequest;
-import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
+import com.glxp.sale.admin.req.purchase.*;
-import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.auth.impl.CustomerContactService;
 import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
 import com.glxp.sale.admin.service.purchase.SupCertService;
+import com.glxp.sale.admin.service.purchase.SupCertSetService;
 import com.glxp.sale.admin.service.purchase.SupCompanyService;
 import com.glxp.sale.admin.util.CustomUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,6 +41,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.ListIterator;
 
 @RestController
 public class SupCompanyController {
@@ -92,9 +98,46 @@ public class SupCompanyController {
     }
 
 
+    @Resource
+    SupCertSetService supCertSetService;
+
+
     @AuthRuleAnnotation("")
     @PostMapping("/api/pur/modifyCompany")
     public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) {
+
+        if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
+            //提交审核
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+            List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
+            //验证
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
+                if (supCertSetEntity.isNeed()) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable.remove();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                    errMsg = errMsg + "," + supCertSetEntity.getName();
+                }
+                return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
+            }
+        }
+
+
         companyEntity.setUpdateTime(new Date());
         boolean b = companyService.modifyCompany(companyEntity);
         CustomerContactEntity customerContactEntity = new CustomerContactEntity();
@@ -122,9 +165,12 @@ public class SupCompanyController {
             filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
             List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
             if (CollUtil.isNotEmpty(supCertEntityList)) {
-                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
+                for (SupCertEntity supCertEntity : supCertEntityList) {
+                    supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
+                    supCertService.updateCompanyCert(supCertEntity);
+                }
+//                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
             }
-
         }
 
 
@@ -157,6 +203,22 @@ public class SupCompanyController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/company/selectBind")
+    public BaseResponse selectBind(@RequestBody SelectCorpBindRequest selectCorpBindRequest) {
+
+        BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(selectCorpBindRequest.getCustomerId());
+        SupCompanyEntity supCompanyEntity = new SupCompanyEntity();
+        supCompanyEntity.setCustomerId(basicUnitMaintainEntity.getErpId());
+        supCompanyEntity.setCompanyName(basicUnitMaintainEntity.getName());
+        supCompanyEntity.setCreditNum(basicUnitMaintainEntity.getCreditNo());
+        supCompanyEntity.setContacts(basicUnitMaintainEntity.getContact());
+        supCompanyEntity.setTel(basicUnitMaintainEntity.getMobile());
+
+        return ResultVOUtils.success(supCompanyEntity);
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("api/pur/supCompany/delete")
     public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) {

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java

@@ -7,15 +7,18 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
 import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
 import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.info.DeleteRequest;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
 import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
 import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.purchase.SupCertService;
+import com.glxp.sale.admin.service.purchase.SupCertSetService;
 import com.glxp.sale.admin.service.purchase.SupCompanyService;
 import com.glxp.sale.admin.service.purchase.SupManufacturerService;
 import com.glxp.sale.common.enums.ResultEnum;
@@ -32,6 +35,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.ListIterator;
 
 @RestController
 public class SupManufacturerController {
@@ -45,6 +49,8 @@ public class SupManufacturerController {
     private SupCertService supCertService;
     @Resource
     private SupCompanyService supCompanyService;
+    @Resource
+    SupCertSetService supCertSetService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sup/manufacturer/getCompanyInfo")
@@ -67,9 +73,27 @@ public class SupManufacturerController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/sup/manufacturer/getCompanyBySup")
+    public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
+        PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
+        PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(companyEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @PostMapping("/sup/manufacturer/addCompany")
     public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
+
+        String customerId = getCustomerId();
+        if (!customerId.equals("110")) {
+            supManufacturerEntity.setCustomerId(customerId);
+        }
+
         supManufacturerEntity.setCreateDate(new Date());
         supManufacturerEntity.setUpdateDate(new Date());
         boolean b = supManufacturerService.insertCompany(supManufacturerEntity);
@@ -95,10 +119,56 @@ public class SupManufacturerController {
                     || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
                 return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！");
             }
+
+            //验证证书是否齐全
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+            List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
+
+                if (supCertSetEntity.isNeed()
+                        ||
+                        (!supCertSetEntity.isNeed() &&
+                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
+                                && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+
+                        ||
+                        (!supCertSetEntity.isNeed()
+                                && supCertSetEntity.getForeign() != null
+                                && supCertSetEntity.getForeign() == 1
+                                && supManufacturerEntity.getCompanyType().equals("1"))) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable.remove();
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    iterable.remove();
+                }
+
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                    errMsg = errMsg + "," + supCertSetEntity.getName();
+                }
+                return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
+            }
+
+
         }
 
+
         supManufacturerEntity.setUpdateDate(new Date());
-        SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId());
+        SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId());
         boolean b = supManufacturerService.modifyCompany(supManufacturerEntity);
         //修改证书对应的供应商ID，生产企业ID
         supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId());
@@ -127,7 +197,11 @@ public class SupManufacturerController {
             filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER);
             List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
             if (CollUtil.isNotEmpty(supCertEntityList)) {
-                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
+                for (SupCertEntity supCertEntity : supCertEntityList) {
+                    supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
+                    supCertService.updateCompanyCert(supCertEntity);
+                }
+//                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
             }
         }
 

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java

@@ -10,14 +10,16 @@ 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.CompanyProductRelevanceEntity;
-import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.*;
-import com.glxp.sale.admin.entity.purchase.SupProductEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
 import com.glxp.sale.admin.req.purchase.FilterPoductRequest;
 import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
+import com.glxp.sale.admin.req.purchase.SelectProductBindRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.purchase.SupProductResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.basic.BasicThirdSysService;
@@ -25,6 +27,8 @@ import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.purchase.SupCertService;
+import com.glxp.sale.admin.service.purchase.SupCertSetService;
+import com.glxp.sale.admin.service.purchase.SupManufacturerService;
 import com.glxp.sale.admin.service.purchase.SupProductService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.util.CustomUtil;
@@ -34,6 +38,7 @@ import com.glxp.sale.admin.util.UdiInfoUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -45,6 +50,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.ListIterator;
 
 @RestController
 public class SupProductController {
@@ -101,6 +107,46 @@ public class SupProductController {
         }
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/sup/product/selectBind")
+    public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
+
+
+        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(selectProductBindRequest.getRelIdFk());
+
+        SupProductEntity supProductEntity = new SupProductEntity();
+        BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
+        supProductEntity.setProductId(selectProductBindRequest.getProductId());
+        supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
+        supProductEntity.setRelIdFk(selectProductBindRequest.getRelIdFk());
+        supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
+        supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
+        supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
+        supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
+        supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
+        supProductEntity.setCreate_date(new Date());
+        supProductEntity.setUpdate_date(new Date());
+        supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
+        supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
+        supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
+        supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
+
+        return ResultVOUtils.success(supProductEntity);
+//        boolean b = supProductService.insertRegistration(supProductEntity);
+//        if (b) {
+//            return ResultVOUtils.success(supProductEntity);
+//        } else {
+//            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+//        }
+    }
+
+
+    @Resource
+    SupManufacturerService supManufacturerService;
+    @Resource
+    SupCertSetService supCertSetService;
+
     @AuthRuleAnnotation("")
     @PostMapping("/sup/product/modifyRegistration")
     public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) {
@@ -108,8 +154,71 @@ public class SupProductController {
         if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) {
             return ResultVOUtils.error(500, "参数错误！");
         }
+
+        //提交审核
+        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
+            //判断是否上级供应商是否审核通过
+
+            SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
+            if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
+                    || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
+                return ResultVOUtils.error(500, "所属生产企业资质未通过审核，暂时无法提交！");
+            }
+
+            //验证证书是否齐全
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+            List<SupCertEntity> supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
+
+                if (supCertSetEntity.isNeed()
+                        ||
+                        (!supCertSetEntity.isNeed() &&
+                                supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
+                                && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")
+                        )
+                        ||
+                        (!supCertSetEntity.isNeed() &&
+                                supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3
+                                && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")
+                        )
+                        ||
+                        (!supCertSetEntity.isNeed() &&
+                                !StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())
+                        )
+                        ||
+                        (!supCertSetEntity.isNeed() &&
+                                !StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb())
+                        )
+                ) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable.remove();
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    iterable.remove();
+                }
+
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                    errMsg = errMsg + "," + supCertSetEntity.getName();
+                }
+                return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
+            }
+
+        }
         supProductEntity.setUpdate_date(new Date());
-        SupProductEntity originEntity = supProductService.findRegistration(supProductEntity.getId());
+        SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId());
         supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(),
                 supProductEntity.getManufacturerIdFk(), originEntity.getProductId(), supProductEntity.getProductId());
         boolean b = supProductService.modifyRegistration(supProductEntity);
@@ -141,7 +250,14 @@ public class SupProductController {
             filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT);
             List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
             if (CollUtil.isNotEmpty(supCertEntityList)) {
-                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
+
+
+                for (SupCertEntity supCertEntity : supCertEntityList) {
+                    supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
+                    supCertService.updateCompanyCert(supCertEntity);
+                }
+
+//                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
             }
         }
 
@@ -149,73 +265,73 @@ public class SupProductController {
         supProductEntity.setUpdate_date(new Date());
         boolean b = supProductService.modifyRegistration(supProductEntity);
 
-        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) {
+//        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) {
-            SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId());
+//            SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId());
-
+//
-            //步骤1：先添加到主系统第三方产品信息；
+//            //步骤1：先添加到主系统第三方产品信息；
-            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
+//            BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
-            ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
+//            ThrProductsEntity thrProductsEntity = new ThrProductsEntity();
-            thrProductsEntity.setCode(gennerOrderUtils.getRelId() + "");
+//            thrProductsEntity.setCode(gennerOrderUtils.getRelId() + "");
-            thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId());
+//            thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId());
-            thrProductsEntity.setName(supProductEntity.getRecordProductName());
+//            thrProductsEntity.setName(supProductEntity.getRecordProductName());
-            thrProductsEntity.setSpec(supProductEntity.getSpecification());
+//            thrProductsEntity.setSpec(supProductEntity.getSpecification());
-            thrProductsEntity.setStandard(supProductEntity.getSpecification());
+//            thrProductsEntity.setStandard(supProductEntity.getSpecification());
-            thrProductsEntity.setManufactory(supProductResponse.getManufacturerName());
+//            thrProductsEntity.setManufactory(supProductResponse.getManufacturerName());
-            thrProductsService.insertThrProducts(thrProductsEntity);
+//            thrProductsService.insertThrProducts(thrProductsEntity);
-
+//
-
+//
-            //步骤2：添加到关联表
+//            //步骤2：添加到关联表
-            String uuid = CustomUtil.getUUId();
+//            String uuid = CustomUtil.getUUId();
-            UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
+//            UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
-            udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
+//            udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
-            udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
+//            udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
-            udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
+//            udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
-            udiRelevanceEntity.setMainName(thrProductsEntity.getName());
+//            udiRelevanceEntity.setMainName(thrProductsEntity.getName());
-            udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
+//            udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
-            String time = DateUtil.getDateTime();
+//            String time = DateUtil.getDateTime();
-            udiRelevanceEntity.setUpdateTime(time);
+//            udiRelevanceEntity.setUpdateTime(time);
-            udiRelevanceEntity.setModifyTime(time);
+//            udiRelevanceEntity.setModifyTime(time);
-            udiRelevanceEntity.setUuid(uuid);
+//            udiRelevanceEntity.setUuid(uuid);
-            udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName());
+//            udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName());
-            udiRelevanceEntity.setSupName(supProductResponse.getSupName());
+//            udiRelevanceEntity.setSupName(supProductResponse.getSupName());
-            udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
+//            udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
-            udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+//            udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
-
+//
-
+//
-            //步骤3：添加基础信息表
+//            //步骤3：添加基础信息表
-            UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+//            UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
-            udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+//            udiInfoEntity.setNameCode(thrProductsEntity.getCode());
-            udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+//            udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
-            udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+//            udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
-            udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName());
+//            udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName());
-            udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+//            udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
-            udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode());
+//            udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode());
-            udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
+//            udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
-            udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+//            udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
-            udiInfoEntity.setDiType(1);
+//            udiInfoEntity.setDiType(1);
-            udiInfoEntity.setScbssfbhph("是");
+//            udiInfoEntity.setScbssfbhph("是");
-            udiInfoEntity.setScbssfbhscrq("是");
+//            udiInfoEntity.setScbssfbhscrq("是");
-            udiInfoEntity.setScbssfbhsxrq("是");
+//            udiInfoEntity.setScbssfbhsxrq("是");
-            udiInfoEntity.setScbssfbhxlh("否");
+//            udiInfoEntity.setScbssfbhxlh("否");
-            udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
+//            udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-            udiInfoService.insertUdiInfo(udiInfoEntity);
+//            udiInfoService.insertUdiInfo(udiInfoEntity);
-
+//
-
+//
-            //步骤4：添加供应商关联表
+//            //步骤4：添加供应商关联表
-            CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
+//            CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-            companyProductRelevanceEntity.setCreate_time(new Date());
+//            companyProductRelevanceEntity.setCreate_time(new Date());
-            companyProductRelevanceEntity.setUpdate_time(new Date());
+//            companyProductRelevanceEntity.setUpdate_time(new Date());
-            companyProductRelevanceEntity.setAuditStatus("3");
+//            companyProductRelevanceEntity.setAuditStatus("3");
-            companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId());
+//            companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId());
-            companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId());
+//            companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId());
-            companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId());
+//            companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId());
-            companyProductRelevanceEntity.setProductId(supProductEntity.getProductId());
+//            companyProductRelevanceEntity.setProductId(supProductEntity.getProductId());
-            companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId());
+//            companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId());
-            companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk());
+//            companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk());
-            companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
+//            companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
-
+//
-
+//
-        }
+//        }
 
         if (b) {
             return ResultVOUtils.success("审核通过！");

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

@@ -30,4 +30,6 @@ public interface InvPreInProductDao {
     boolean deleteById(@Param("id") String id);
 
     boolean deleteAll();
+
+    boolean deleteByOrderIdFk(@Param("orderIdFk") String orderIdFk);
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java

@@ -0,0 +1,19 @@
+package com.glxp.sale.admin.dao.purchase;
+
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SupCertSetDao {
+    List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
+
+    boolean insertCertSet(SupCertSetEntity supCertSetEntity);
+
+
+    boolean updateCertSet(SupCertSetEntity supCertSetEntity);
+
+    boolean deleteById(String id);
+}

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

@@ -73,4 +73,7 @@ public class OrderEntity {
      */
     private boolean codeFillCheck;
 
+    private String preInBillNo;
+    private String preOutBillNo;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java

@@ -26,6 +26,7 @@ public class InvProductEntity {
     private String invWarehouseCode;
     private String price;
     private Date updateTime;
+    private String orderIdFk;
 
     public Integer getInCount() {
         if (inCount == null)

api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java

@@ -28,5 +28,6 @@ public class SupCertEntity {
     private String productIdFk;
     private Integer auditStatus;            //审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过
     private String auditComment;
+    private int status;                 //0：启用，1:禁用
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java

@@ -0,0 +1,24 @@
+package com.glxp.sale.admin.entity.purchase;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SupCertSetEntity {
+
+    private Integer id;
+    private String name;
+    private boolean need;
+    private Integer foreign;
+    private String cplx;
+    private String hchzsb;
+    private String flbm;
+    private Integer imports;
+    private String remark;
+    private Date updateTime;
+    private Integer type;
+
+    private boolean isPass;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java

@@ -75,4 +75,6 @@ public class SupCompanyEntity {
     private String auditComment;
     private Integer editStatus;
 
+    private int status;         //0：启用，1:禁用
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java

@@ -54,5 +54,7 @@ public class SupProductEntity {
     private String ybbm;
     private String measname;
     private String cpms;
+    private String hchzsb;
+    private String relIdFk;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.sale.admin.req.purchase;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterCertSetsRequest extends ListPageRequest {
+
+    private String name;
+    private Integer type;
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSelCertRequest.java

@@ -0,0 +1,16 @@
+package com.glxp.sale.admin.req.purchase;
+
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostSelCertRequest {
+
+
+    private Integer certType;
+    private String manufacturerIdFk;
+    private String productIdFk;
+    private List<SupCertSetEntity> supCertSetEntities;
+}

api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectCorpBindRequest.java

@@ -0,0 +1,9 @@
+package com.glxp.sale.admin.req.purchase;
+
+import lombok.Data;
+
+@Data
+public class SelectCorpBindRequest {
+
+    private String customerId;
+}

api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectProductBindRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.sale.admin.req.purchase;
+
+import lombok.Data;
+
+@Data
+public class SelectProductBindRequest {
+
+    private String productId;
+    private String relIdFk;
+    private String manufacturerId;
+    private String customerId;
+    private Integer auditStatus;
+}

api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java

@@ -21,4 +21,10 @@ public class OrderNoResult {
     //复制单号，多个单号之间使用英文逗号,分隔
     private String replicateNo;
 
+    //验收出库关联的预验收入库单，多个单号,隔开
+    private String preInBillNo;
+
+    //预验收入库单关联的预验收出库单，多个单号,隔开
+    private String preOutBillNo;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java

@@ -25,6 +25,7 @@ public class InvProductResponse {
     private String invStorageName;
     private String invSubStorageName;
     private String invWarehouseCode;
+    private String orderIdFk;
 
     public Integer getInCount() {
         if (inCount == null)

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

@@ -93,6 +93,9 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
 
     @Override
     public BasicUnitMaintainEntity selectByErpId(String id) {
+        if (id == null) {
+            return null;
+        }
         BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest();
         filterUdiInfoRequest.setErpId(id);
         List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java

@@ -30,4 +30,6 @@ public interface InvPreInProductDetailService {
 
 
     InvProductDetailEntity statInvPreInDetail(String code);
+
+    boolean deleteByOrderIdFk(String orderIdFk);
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java

@@ -26,4 +26,6 @@ public interface InvPreInProductService {
 
     boolean deleteAll();
 
+    boolean deleteByOrderIdFk(String orderIdFk);
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java

@@ -24,4 +24,6 @@ public interface InvPreProductService {
 
     boolean deleteById(String id);
 
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java

@@ -125,8 +125,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
             } else {
                 bacthNo = invProductDetailEntity.getBatchNo();
             }
-            InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode());
+//            InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode());
-            invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
+//            invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
             return invProductDetailEntity;
         }
         return null;
@@ -154,4 +154,9 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
 //            }
 //        }
     }
+
+    @Override
+    public boolean deleteByOrderIdFk(String orderIdFk) {
+        return invPreInProductDetailDao.deleteByOrderId(orderIdFk);
+    }
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+
 @Service
 public class InvPreInProductServiceImpl implements InvPreInProductService {
 
@@ -82,5 +83,10 @@ public class InvPreInProductServiceImpl implements InvPreInProductService {
         return invPreInProductDao.deleteAll();
     }
 
+    @Override
+    public boolean deleteByOrderIdFk(String orderIdFk) {
+        return invPreInProductDao.deleteByOrderIdFk(orderIdFk);
+    }
+
 
 }

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java

@@ -82,4 +82,5 @@ public class InvPreProductServiceImpl implements InvPreProductService {
     public boolean deleteById(String id) {
         return invPreProductDao.deleteById(id);
     }
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java

@@ -12,6 +12,12 @@ public interface SupCertService {
 
     SupCertEntity findCompanyCertByName(String name);
 
+    List<SupCertEntity> findAll(String customerId);
+
+    List<SupCertEntity> findAll(String customerId, String manufacturerId);
+
+    List<SupCertEntity> findAll(String customerId, String manufacturerId, String productId);
+
     List<SupCertEntity> getCompanyCert(FilterSupCertRequest filterSupCertRequest);
 
     boolean updateCompanyCert(SupCertEntity supCertEntity);

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java

@@ -0,0 +1,19 @@
+package com.glxp.sale.admin.service.purchase;
+
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
+
+import java.util.List;
+
+public interface SupCertSetService {
+
+
+    List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
+
+    boolean updateCertSet(SupCertSetEntity supCertSetEntity);
+
+    boolean insertCertSet(SupCertSetEntity supCertSetEntity);
+
+    boolean deleteById(String id);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java

@@ -1,7 +1,6 @@
 package com.glxp.sale.admin.service.purchase;
 
 
-
 import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
 import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
 
@@ -11,6 +10,8 @@ public interface SupManufacturerService {
 
     SupManufacturerEntity findCompany(Long id);
 
+    SupManufacturerEntity findManufacturer(String manufacturerId);
+
     SupManufacturerEntity findCompanyByName(String companyName);
 
     List<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest);

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java

@@ -11,6 +11,8 @@ public interface SupProductService {
 
     SupProductEntity findRegistration(Long id);
 
+    SupProductResponse findByProductId(String productId);
+
     SupProductResponse findJoinRegistration(Long id);
 
     SupProductEntity findRegistrationByName(String recordProductName);

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java

@@ -1,6 +1,8 @@
 package com.glxp.sale.admin.service.purchase.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.dao.purchase.SupCertDao;
 import com.glxp.sale.admin.entity.purchase.SupCertEntity;
 import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
@@ -46,6 +48,42 @@ public class SupCertServiceImpl implements SupCertService {
         return supCertDao.findCompanyCertByName(companyName);
     }
 
+    @Override
+    public List<SupCertEntity> findAll(String customerId) {
+        if (StrUtil.isEmpty(customerId))
+            return null;
+        FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+        filterSupCertRequest.setCustomerId(customerId);
+        filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
+        List<SupCertEntity> supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest);
+        return supCertEntityList;
+    }
+
+    @Override
+    public List<SupCertEntity> findAll(String customerId, String manufacturerId) {
+        if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId))
+            return null;
+        FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+        filterSupCertRequest.setCustomerId(customerId);
+        filterSupCertRequest.setManufacturerIdFk(manufacturerId);
+        filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER);
+        List<SupCertEntity> supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest);
+        return supCertEntityList;
+    }
+
+    @Override
+    public List<SupCertEntity> findAll(String customerId, String manufacturerId, String productId) {
+        if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId) || StrUtil.isEmpty(productId))
+            return null;
+        FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+        filterSupCertRequest.setCustomerId(customerId);
+        filterSupCertRequest.setManufacturerIdFk(manufacturerId);
+        filterSupCertRequest.setProductIdFk(productId);
+        filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT);
+        List<SupCertEntity> supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest);
+        return supCertEntityList;
+    }
+
     @Override
     public boolean updateCompanyCert(SupCertEntity supCertEntity) {
         return supCertDao.updateCompanyCert(supCertEntity);

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java

@@ -0,0 +1,48 @@
+package com.glxp.sale.admin.service.purchase.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.purchase.SupCertSetDao;
+import com.glxp.sale.admin.entity.purchase.SupCertSetEntity;
+import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest;
+import com.glxp.sale.admin.service.purchase.SupCertSetService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class SupCertSetServiceImpl implements SupCertSetService {
+
+    @Resource
+    SupCertSetDao supCertSetDao;
+
+    @Override
+    public List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest) {
+
+        if (filterCertSetsRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterCertSetsRequest.getPage() != null) {
+            int offset = (filterCertSetsRequest.getPage() - 1) * filterCertSetsRequest.getLimit();
+            PageHelper.offsetPage(offset, filterCertSetsRequest.getLimit());
+        }
+        return supCertSetDao.filterCertSets(filterCertSetsRequest);
+
+    }
+
+    @Override
+    public boolean updateCertSet(SupCertSetEntity supCertSetEntity) {
+        return supCertSetDao.updateCertSet(supCertSetEntity);
+    }
+
+    @Override
+    public boolean insertCertSet(SupCertSetEntity supCertSetEntity) {
+        return supCertSetDao.insertCertSet(supCertSetEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return supCertSetDao.deleteById(id);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java

@@ -1,5 +1,7 @@
 package com.glxp.sale.admin.service.purchase.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.purchase.SupManufacturerDao;
 import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
@@ -22,6 +24,21 @@ public class SupManufacturerServiceImpl implements SupManufacturerService {
         return supManufacturerDao.findCompany(id);
     }
 
+    @Override
+    public SupManufacturerEntity findManufacturer(String manufacturerId) {
+
+        if (StrUtil.isEmpty(manufacturerId)) {
+            return null;
+        }
+        FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setManufacturerId(manufacturerId);
+        List<SupManufacturerEntity> companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest);
+        if (CollUtil.isNotEmpty(companyEntities)) {
+            return companyEntities.get(0);
+        }
+        return null;
+    }
+
     @Override
     public SupManufacturerEntity findCompanyByName(String companyName) {
         return supManufacturerDao.findCompanyByName(companyName);

api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.sale.admin.service.purchase.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.purchase.SupProductDao;
 import com.glxp.sale.admin.entity.purchase.SupProductEntity;
@@ -24,6 +25,20 @@ public class SupProductServiceImpl implements SupProductService {
         return supProductDao.findRegistration(id);
     }
 
+    @Override
+    public SupProductResponse findByProductId(String productId) {
+
+        if (StrUtil.isEmpty(productId)) {
+            return null;
+        }
+        FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
+        filterPoductRequest.setProductId(productId);
+        List<SupProductResponse> supProductEntities = supProductDao.getRegistration(filterPoductRequest);
+        if (CollUtil.isNotEmpty(supProductEntities))
+            return supProductEntities.get(0);
+        return null;
+    }
+
     @Override
     public SupProductResponse findJoinRegistration(Long id) {
         if (id == null)

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

@@ -98,27 +98,32 @@ public class InvProductsTrService {
                 ErpOrderEntity erpOrderEntity = getErpOrders(warehouseEntity, erpOrderEntities);
 
                 if (bussinessTypeEntity.isPreIn()) {
-                    InvProductEntity invPreProductEntity =
+                    InvProductEntity invPreProductEntity = null;
-                            invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId()
+//                            invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId()
-                                    , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode());
+//                                    , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode());
                     if (invPreProductEntity == null) {
-                        invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity);
+                        invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity);
                         invPreProductEntity.setUpdateTime(new Date());
                         invPreInProductService.insertInvProduct(invPreProductEntity);
-                    } else {
-                        int actCount = getActCount(warehouseEntity);
-                        int count = actCount * warehouseEntity.getCount();
-                        if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                            invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count);
-                        } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
-                            invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count);
-                        }
-                        if (erpOrderEntity.getPrice() != null) {
-                            invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
-                        }
-                        invPreProductEntity.setUpdateTime(new Date());
-                        invPreInProductService.updateInvProduct(invPreProductEntity);
                     }
+
+                    /**
+                     *  else {
+                     *                         int actCount = getActCount(warehouseEntity);
+                     *                         int count = actCount * warehouseEntity.getCount();
+                     *                         if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                     *                             invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count);
+                     *                         } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+                     *                             invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count);
+                     *                         }
+                     *                         if (erpOrderEntity.getPrice() != null) {
+                     *                             invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
+                     *                         }
+                     *                         invPreProductEntity.setUpdateTime(new Date());
+                     *                         invPreInProductService.updateInvProduct(invPreProductEntity);
+                     *                     }
+                     */
+
                 } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库
                     InvProductEntity invPreProductEntity =
                             invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId()
@@ -165,21 +170,23 @@ public class InvProductsTrService {
                     }
 
                     if (orderEntity.isPreCheck()) {
-                        int actCount = getActCount(warehouseEntity);
-                        int count = actCount * warehouseEntity.getCount();
-                        InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(),
-                                warehouseEntity.getSupId(), null, null);
 
-                        if (preInvEntity != null) {
+                        //暂时不需要去计算库存
-                            if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+//                        int actCount = getActCount(warehouseEntity);
-                                preInvEntity.setOutCount(preInvEntity.getOutCount() + count);
+//                        int count = actCount * warehouseEntity.getCount();
-                            }
+//                        InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(),
-                            if (erpOrderEntity.getPrice() != null) {
+//                                warehouseEntity.getSupId(), null, null);
-                                preInvEntity.setPrice(erpOrderEntity.getPrice() + "");
+//
-                            }
+//                        if (preInvEntity != null) {
-                            preInvEntity.setUpdateTime(new Date());
+//                            if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                            invPreInProductService.updateInvProduct(preInvEntity);
+//                                preInvEntity.setOutCount(preInvEntity.getOutCount() + count);
-                        }
+//                            }
+//                            if (erpOrderEntity.getPrice() != null) {
+//                                preInvEntity.setPrice(erpOrderEntity.getPrice() + "");
+//                            }
+//                            preInvEntity.setUpdateTime(new Date());
+//                            invPreInProductService.updateInvProduct(preInvEntity);
+//                        }
 
                     }
 
@@ -207,10 +214,10 @@ public class InvProductsTrService {
                         } else {
                             invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2);
                             //todo 为什么要插入库存
-                            if (orderEntity.isPreCheck()) {
+//                            if (orderEntity.isPreCheck()) {
-//                                insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存
+////                                insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存
-                                invPreInProductDetailService.insertInvProducts(invProductDetailEntities);
+//                                invPreInProductDetailService.insertInvProducts(invProductDetailEntities);
-                            }
+//                            }
                         }
                         if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) {
                             mInvProductDetailEntities.addAll(invProductDetailEntities);
@@ -866,6 +873,38 @@ public class InvProductsTrService {
         return invProductEntity;
     }
 
+    //生成预验收库存
+    private InvProductEntity buildInvPreInProduct(OrderEntity orderEntity, ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity) {
+        InvProductEntity invProductEntity = new InvProductEntity();
+        invProductEntity.setRelIdFk(erpOrderEntity.getGoodsid());
+        if (StrUtil.isNotEmpty(erpOrderEntity.getBatchNo())) {
+            invProductEntity.setBatchNo(erpOrderEntity.getBatchNo());
+        } else
+            invProductEntity.setBatchNo(null);
+        invProductEntity.setCustomerId(orderEntity.getCustomerId());
+        invProductEntity.setExpireDate(erpOrderEntity.getExpireDate());
+        invProductEntity.setProductionDate(erpOrderEntity.getProductDate());
+        invProductEntity.setGgxh(erpOrderEntity.getPackSpec());
+        invProductEntity.setSupId(warehouseEntity.getSupId());
+        invProductEntity.setNameCode(erpOrderEntity.getNameCode());
+        invProductEntity.setPrice(erpOrderEntity.getPrice() + "");
+        invProductEntity.setProductsName(erpOrderEntity.getCoName());
+        invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany());
+        invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode());
+        invProductEntity.setInvStorageCode(warehouseEntity.getLocStorageCode());
+        invProductEntity.setOrderIdFk(orderEntity.getId());
+        invProductEntity.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode());
+        int count = getActCount(warehouseEntity) * warehouseEntity.getCount();
+        if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+            invProductEntity.setOutCount(count);
+        } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+            invProductEntity.setInCount(count);
+        }
+
+        return invProductEntity;
+    }
+
+
     //生成库存条码
     private List<InvProductDetailEntity> buildInvProductDetail(String orderId, ErpOrderEntity erpOrderEntity,
                                                                OrderEntity orderEntity, Integer purchaseType) {
@@ -1049,30 +1088,6 @@ public class InvProductsTrService {
     }
 
 
-    //根据条码获取预入库结余数量
-    public int getPreCountByOrder(String mainAction, String code, String supId) {
-        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-        filterInvProductDetailRequest.setCode(code);
-        filterInvProductDetailRequest.setSupId(supId);
-        if (mainAction != null)
-            filterInvProductDetailRequest.setMainAction(mainAction);
-        List<InvProductDetailJoinResponse> detailJoinResponseList
-                = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest);
-        int invCount = 0;
-        if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) {
-            for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) {
-                if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                    invCount = invCount - invProductDetailJoinResponse.getCount();
-                } else {
-                    invCount = invCount + invProductDetailJoinResponse.getCount();
-                }
-
-            }
-        }
-        return invCount;
-    }
-
-
     public int getPreCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) {
         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
         filterInvProductDetailRequest.setSupId(supId);
@@ -1097,53 +1112,6 @@ public class InvProductsTrService {
     }
 
 
-    //根据条码获取库存结余数量
-    public int getCountByProduct(String mainAction, String productId, String batchNo, String supId) {
-        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-        filterInvProductDetailRequest.setProductIdFk(productId);
-        filterInvProductDetailRequest.setBatchNo(batchNo);
-        filterInvProductDetailRequest.setSupId(supId);
-        if (mainAction != null)
-            filterInvProductDetailRequest.setMainAction(mainAction);
-        List<InvProductDetailJoinResponse> detailJoinResponseList
-                = invProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest);
-        int invCount = 0;
-        if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) {
-            for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) {
-                if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                    invCount = invCount - invProductDetailJoinResponse.getCount();
-                } else {
-                    invCount = invCount + invProductDetailJoinResponse.getCount();
-                }
-            }
-        }
-        return invCount;
-    }
-
-    //根据条码获取预入库结余数量
-    public int getPreCountByProduct(String mainAction, String productId, String batchNo, String supId) {
-        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-        filterInvProductDetailRequest.setProductIdFk(productId);
-        filterInvProductDetailRequest.setBatchNo(batchNo);
-        filterInvProductDetailRequest.setSupId(supId);
-        if (mainAction != null)
-            filterInvProductDetailRequest.setMainAction(mainAction);
-        List<InvProductDetailJoinResponse> detailJoinResponseList
-                = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest);
-        int invCount = 0;
-        if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) {
-            for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) {
-                if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
-                    invCount = invCount - invProductDetailJoinResponse.getCount();
-                } else {
-                    invCount = invCount + invProductDetailJoinResponse.getCount();
-                }
-
-            }
-        }
-        return invCount;
-    }
-
     //合并条码
     public List<WarehouseEntity> filterMapCodes(List<WarehouseEntity> warehouseEntityList) {
         Map<String, WarehouseEntity> filterMap = new HashMap<>();

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

@@ -41,9 +41,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
+import java.util.function.BiConsumer;
-import java.util.List;
 
 @Service
 public class IoTransInoutService {
@@ -93,7 +92,14 @@ public class IoTransInoutService {
     UdimsOrderDetailDao udimsOrderDetailDao;
     @Resource
     GennerOrderUtils gennerOrderUtils;
-
+    @Resource
+    InvPreInProductService invPreInProductService;
+    @Resource
+    InvPreInProductDetailService invPreInProductDetailService;
+    @Resource
+    InvPreProductDetailService invPreProductDetailService;
+    @Resource
+    InvProductDetailService invProductDetailService;
 
     //手持终端生成订单，插入零时表
     @Async
@@ -497,10 +503,6 @@ public class IoTransInoutService {
         }
     }
 
-    @Resource
-    InvPreProductDetailService invPreProductDetailService;
-    @Resource
-    InvProductDetailService invProductDetailService;
 
     public String checkOriginCode(WarehouseEntity warehouseEntity, BussinessTypeEntity bussinessTypeEntity) {
 
@@ -839,8 +841,8 @@ public class IoTransInoutService {
     public void syncprintOrder(String orderId) {
         OrderEntity orderEntity = orderService.findById(orderId);
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
-        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && StrUtil.isEmpty(orderEntity.getErpFk())
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS
-        ) {
+                && StrUtil.isEmpty(orderEntity.getErpFk())) {
 
             //查询单据校验后生成的单据详情
             FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
@@ -935,8 +937,36 @@ public class IoTransInoutService {
                 stockOrderEntity.setOrderIdFk(orderEntity.getId());
                 stockOrderService.updateById(stockOrderEntity);
             }
+        }
+
+
+        //预验收出库，1：删除对应的预验收库存；2.把预验收单关联到对应的扫码单据与业务单据
+        if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) {
+            List<WarehouseEntity> codeList = warehouseService.findByReceiptId(orderEntity.getId());
+            Map<String, String> preInOrder = new HashMap<>();
+            for (WarehouseEntity warehouseEntity : codeList) {
+                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailService.findByOriginCode(warehouseEntity.getCode());
+                if (invProductDetailEntities.size() > 0) {
+                    preInOrder.put(invProductDetailEntities.get(0).getOrderIdFk(), invProductDetailEntities.get(0).getOrderIdFk());
+                }
+            }
+            if (preInOrder.size() > 0) {
+                String preInBillNo = "";
+                for (String key : preInOrder.keySet()) {
+                    preInBillNo = preInBillNo + "," + key;
+                    OrderEntity preInEntity = orderService.findById(key);
+                    preInEntity.setPreOutBillNo(orderEntity.getId());
+                    orderService.updateOrder(preInEntity);
+                    invPreInProductService.deleteByOrderIdFk(preInEntity.getId());
+                    invPreInProductDetailService.deleteByOrderIdFk(preInEntity.getId());
+                }
+                orderEntity.setPreInBillNo(preInBillNo.substring(1));
+                orderService.updateOrder(orderEntity);
+            }
+
 
         }
+
     }
 
 
@@ -995,7 +1025,6 @@ public class IoTransInoutService {
             }
         } else {
             stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
-
             orderEntity.setReceiveStatus(1);
 //            invProductsTrService.genInvProducts(orderEntity.getId());
         }

api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml

@@ -16,7 +16,7 @@
 
 
     <insert id="insertCustomerContact" keyProperty="customerId"
-            parameterType="com.glxp.sale.admin.entity.auth.CustomerInfoEntity">
+            parameterType="com.glxp.sale.admin.entity.auth.CustomerContactEntity">
         INSERT INTO customer_contact
         (
         customerId, contacts,

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

@@ -31,7 +31,7 @@
         basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
         ,basic_products.basicPrductRemak1
         ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
-        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid

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

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck)
+                             fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -57,7 +57,7 @@
                 #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode},
                 #{deptCode},
                 #{printRemark},
-                #{codeFillCheck})
+                #{codeFillCheck},#{preInBillNo},#{preOutBillNo})
     </insert>
 
 
@@ -69,7 +69,7 @@
                       receiveStatus, erpFk, stockCheckFk, customerId, supId,
                       exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                       outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                      fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck)
+                      fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -106,7 +106,7 @@
                 #{invStorageCode},
                 #{deptCode},
                 #{printRemark},
-                #{codeFillCheck})
+                #{codeFillCheck},#{preInBillNo},#{preOutBillNo})
     </insert>
 
 
@@ -149,6 +149,9 @@
             <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
             <if test="printRemark != null and printRemark != ''">printRemark=#{printRemark},</if>
             <if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if>
+            <if test="preInBillNo != null">preInBillNo=#{preInBillNo},</if>
+            <if test="preOutBillNo != null">preOutBillNo=#{preOutBillNo},</if>
+
         </trim>
         WHERE id = #{id}
     </update>
@@ -652,7 +655,7 @@
     </update>
 
     <select id="selectOrderNos" resultType="com.glxp.sale.admin.res.inout.OrderNoResult">
-        select id, supplementNo, originUllageSupNo, ullageSupNo, replicateNo
+        select id, supplementNo, originUllageSupNo, ullageSupNo, replicateNo,preInBillNo,preOutBillNo
         from io_order
         where id = #{id}
     </select>

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -124,7 +124,7 @@
         ,inv_prein_product.reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name
-        invSubStorageName,inv_prein_product.invWarehouseCode
+        invSubStorageName,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk
         FROM inv_prein_product
         inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid
@@ -203,13 +203,14 @@
         insert INTO inv_prein_product
         (productsName, nameCode, relIdFk, ggxh, batchNo,
          productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
-         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price, updateTime)
+         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price, updateTime,
+         orderIdFk)
         values (#{productsName}, #{nameCode},
                 #{relIdFk}, #{ggxh}, #{batchNo},
                 #{productionDate}, #{expireDate},
                 #{ylqxzcrbarmc}, #{zczbhhzbapzbh},
                 #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk}
-                   , #{invStorageCode}, #{invWarehouseCode}, #{price}, #{updateTime})
+                   , #{invStorageCode}, #{invWarehouseCode}, #{price}, #{updateTime}, #{orderIdFk})
     </insert>
 
 
@@ -219,6 +220,13 @@
         WHERE id = #{id}
     </delete>
 
+
+    <delete id="deleteByOrderIdFk" parameterType="Map">
+        DELETE
+        FROM inv_prein_product
+        WHERE orderIdFk = #{orderIdFk}
+    </delete>
+
     <delete id="deleteAll" parameterType="Map">
         DELETE
         FROM inv_prein_product
@@ -246,7 +254,7 @@
             <if test="price != null">price=#{price},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
-
+            <if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml

@@ -54,7 +54,6 @@
             <if test="manufacturerIdFk != null and manufacturerIdFk != ''">
                 and manufacturerIdFk = #{manufacturerIdFk}
             </if>
-
         </where>
 
     </select>
@@ -76,6 +75,7 @@
             <if test="code != null">`code`=#{code},</if>
             <if test="auditStatus != null">`auditStatus`=#{auditStatus},</if>
             <if test="auditComment != null">`auditComment`=#{auditComment},</if>
+            <if test="status != null">`status`=#{status},</if>
 
         </trim>
         WHERE id = #{id}
@@ -111,7 +111,7 @@
     <insert id="insertCompanyCert" parameterType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
         INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime
                             , vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus
-                            , auditComment)
+                            , auditComment,status)
         values (#{name},
                 #{customerId},
                 #{filePath},
@@ -120,7 +120,7 @@
                 #{updateTime},
                 #{vailDate},
                 #{expireDate},
-                #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment})
+                #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment},#{status})
     </insert>
 
     <delete id="deleteById" parameterType="Map">

api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.purchase.SupCertSetDao">
+
+    <select id="filterCertSets" parameterType="com.glxp.sale.admin.req.purchase.FilterCertSetsRequest"
+            resultType="com.glxp.sale.admin.entity.purchase.SupCertSetEntity">
+        select * from sup_cert_set
+        <where>
+            <if test="name != '' and name!=null">
+                and `name` = #{name}
+            </if>
+            <if test="type != '' and type!=null">
+                and `type` = #{type}
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM sup_cert_set
+        WHERE id = #{id}
+    </delete>
+
+
+    <update id="updateCertSet" parameterType="com.glxp.sale.admin.entity.purchase.SupCertSetEntity">
+        UPDATE sup_cert_set
+        <trim prefix="set" suffixOverrides=",">
+            <if test="name != null">name=#{name},</if>
+            <if test="need != null">`need`=#{need},</if>
+            <if test="foreign != null">`foreign`=#{foreign},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="cplx != null">cplx=#{cplx},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="imports != null">`imports`=#{imports},</if>
+            <if test="type != null">`type`=#{type},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+
+    <insert id="insertCertSet" parameterType="com.glxp.sale.admin.entity.purchase.SupCertSetEntity">
+        INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports,`type`)
+        values (#{name},
+                #{need},
+                #{foreign},
+                #{remark},
+                #{cplx},
+                #{updateTime},
+                #{hchzsb},
+                #{flbm},
+                #{imports},#{type})
+    </insert>
+
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml

@@ -7,14 +7,14 @@
     <select id="findCompany" parameterType="java.lang.String"
             resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
         SELECT *
-        FROM sup_company
+        FROM company
         where customerId = #{CustomerId}
     </select>
 
 
     <select id="filterCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest"
             resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
-        SELECT * FROM sup_company
+        SELECT * FROM company
         <where>
             <if test="customerId != null and customerId != ''">
                 and parentIdFk = #{customerId}
@@ -48,7 +48,7 @@
     </select>
     <delete id="deleteCompany" parameterType="java.lang.Long">
         delete
-        from sup_company
+        from company
         where customerId = #{customerId}
     </delete>
 
@@ -56,13 +56,13 @@
             resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
 
         SELECT *
-        FROM sup_company
+        FROM company
         where companyName = #{companyName}
     </select>
 
     <select id="getSubCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest"
             resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
-        SELECT * FROM sup_company
+        SELECT * FROM company
         <where>
             <if test="customerId != null and customerId != ''">
                 and parentIdFk = #{customerId}
@@ -120,7 +120,7 @@
 
     <update id="modifyCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
 
-        UPDATE sup_company
+        UPDATE company
         <trim prefix="set" suffixOverrides=",">
             <if test="companyName != null">companyName=#{companyName},</if>
             <if test="bussinessStatus != null">bussinessStatus=#{bussinessStatus},</if>
@@ -150,7 +150,7 @@
     </update>
 
     <insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
-        INSERT INTO sup_company(companyName, bussinessStatus, creditNum, classes, area,
+        INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area,
                                       detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
                                       auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment,
                                       editStatus)

api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml

@@ -19,8 +19,8 @@
 
     <select id="getCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
-        SELECT sup_manufacturer.* ,sup_company.companyName supName FROM sup_manufacturer
+        SELECT sup_manufacturer.* ,company.companyName supName FROM sup_manufacturer
-        inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
+        inner join company on sup_manufacturer.customerId = company.customerId
         <where>
             <if test="id != null and id != ''">
                 and id = #{id}

api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml

@@ -19,10 +19,10 @@
 
     <select id="getRegistration" parameterType="com.glxp.sale.admin.req.purchase.FilterPoductRequest"
             resultType="com.glxp.sale.admin.res.purchase.SupProductResponse">
-        SELECT sup_product.* ,sup_company.companyName
+        SELECT sup_product.* ,company.companyName
         supName,sup_manufacturer.companyName manufacturerName FROM sup_product
-        inner join sup_company
+        inner join company
-        on sup_product.customerId = sup_company.customerId
+        on sup_product.customerId = company.customerId
         INNER JOIN sup_manufacturer
         on sup_manufacturer.manufacturerId =
         sup_product.manufacturerIdFk
@@ -113,23 +113,26 @@
             <if test="ybbm != null">ybbm=#{ybbm},</if>
             <if test="measname != null">measname=#{measname},</if>
             <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+
         </set>
         WHERE id=#{id}
 
     </update>
 
-    <insert id="insertRegistration" parameterType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
+    <insert id="insertRegistration" parameterType="com.glxp.sale.admin.entity.purchase.SupProductEntity"
+            useGeneratedKeys="true">
         INSERT INTO sup_product(enterpriseId, recordCode, recordProductName,
-                                                 productManageType, recordPeopleName, recordPeopleArea,
+                                productManageType, recordPeopleName, recordPeopleArea,
-                                                 recordPeopleAreaCode, recordPeopleAddress, productType,
+                                recordPeopleAreaCode, recordPeopleAddress, productType,
-                                                 productDirectoryCode, agentName, agentArea,
+                                productDirectoryCode, agentName, agentArea,
-                                                 agentAreaCode, agentAddress, instructions,
+                                agentAreaCode, agentAddress, instructions,
-                                                 productAddress, recordText, placeOrigin,
+                                productAddress, recordText, placeOrigin,
-                                                 productionRegion, productionCompanyName, afterSale,
+                                productionRegion, productionCompanyName, afterSale,
-                                                 specification, structure, `scope`,
+                                specification, structure, `scope`,
-                                                 other, filePath, remark,
+                                other, filePath, remark,
-                                                 create_date, update_date, manufacturerIdFk, customerId, productId
+                                create_date, update_date, manufacturerIdFk, customerId, productId
-            , auditStatus, auditComment, sptm, ybbm, measname, cpms)
+            , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb)
         values (#{enterpriseId}, #{recordCode}, #{recordProductName},
                 #{productManageType}, #{recordPeopleName}, #{recordPeopleArea},
                 #{recordPeopleAreaCode}, #{recordPeopleAddress}, #{productType},
@@ -140,7 +143,7 @@
                 #{specification}, #{structure}, #{scope},
                 #{other}, #{filePath}, #{remark},
                 #{create_date}, #{update_date}, #{manufacturerIdFk}, #{customerId}, #{productId}
-                   , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms})
+                   , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms}, #{hchzsb})
     </insert>
 
     <delete id="deleteById" parameterType="Map">

scripts/vue-admin-zz.sql

@@ -1,3 +1,257 @@
 /** 2022-10-20 **/
 ALTER TABLE `udi`.`thr_order` 
-ADD COLUMN `thirdPartyDate` tinyint(0) NULL DEFAULT NULL COMMENT '判断来源至哪里1：第三方 2：自己创建' AFTER `manufactory`;
+ADD COLUMN `thirdPartyDate` tinyint(0) NULL DEFAULT NULL COMMENT '判断来源至哪里1：第三方 2：自己创建' AFTER `manufactory`;
+
+
+/**首营新增字段------**/
+
+alter table auth_user modify column CustomerId varchar(60);
+alter table customer_contact modify column customerId varchar(60);
+alter table auth_user modify column CustomerId varchar(60);
+
+
+
+alter table company_product_relevance modify column customerId varchar(60);
+alter table company_product_relevance modify column enterpriseId varchar(60);
+alter table company_product_relevance modify column productId varchar(60);
+alter table company_product_relevance modify column registrationId varchar(60);
+
+
+
+
+alter table inv_stockprint_pdf_temp modify column printCodeIdFk varchar(255);
+alter table inv_stockprint_pdf_temp modify column stockOrderFk varchar(255);
+
+
+
+
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : mysql
+ Source Server Type    : MySQL
+ Source Server Version : 80021
+ Source Host           : localhost:3306
+ Source Schema         : udiwms_ph1
+
+ Target Server Type    : MySQL
+ Target Server Version : 80021
+ File Encoding         : 65001
+
+ Date: 27/10/2022 14:25:57
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sup_cert
+-- ----------------------------
+DROP TABLE IF EXISTS `sup_cert`;
+CREATE TABLE `sup_cert`  (
+                             `id` int UNSIGNED NOT NULL AUTO_INCREMENT,
+                             `CustomerId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '配送企业ID外键',
+                             `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '证书名称',
+                             `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书编号',
+                             `filePath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '证书文件路径',
+                             `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '备注',
+                             `createTime` datetime(0) NOT NULL COMMENT '创建时间',
+                             `updateTime` datetime(0) NOT NULL COMMENT '更新时间',
+                             `vailDate` datetime(0) NULL DEFAULT NULL COMMENT '有效期',
+                             `expireDate` datetime(0) NULL DEFAULT NULL COMMENT '失效期',
+                             `remark1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                             `type` tinyint NULL DEFAULT NULL COMMENT '证书类型：1:供应商；2.生产企业；3.产品品种',
+                             `manufacturerIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产企业ID外键',
+                             `productIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品证书ID外键',
+                             `auditStatus` tinyint NULL DEFAULT NULL COMMENT '审核状态',
+                             `auditComment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核说明',
+                             PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+
+
+
+DROP TABLE IF EXISTS `sup_cert_set`;
+CREATE TABLE `sup_cert_set`  (
+                                 `id` int NOT NULL AUTO_INCREMENT,
+                                 `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '证书名称',
+                                 `need` tinyint NULL DEFAULT NULL COMMENT '是否必选',
+                                 `type` tinyint NULL DEFAULT NULL COMMENT '类型：（1.供应商，2.生产企业，3，产品)',
+                                 `foreign` tinyint NULL DEFAULT NULL COMMENT '是否进口(1:全部，2：进口，3.国内）',
+                                 `cplx` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品类型（器械/实际）',
+                                 `hchzsb` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品类别（耗材/设备）',
+                                 `flbm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '分类编码',
+                                 `imports` tinyint NULL DEFAULT NULL COMMENT '是否进口(1:全部，2：进口，3.国内）',
+                                 `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `updateTime` datetime(0) NULL DEFAULT NULL,
+                                 PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+-- ----------------------------
+-- Table structure for sup_company
+-- ----------------------------
+DROP TABLE IF EXISTS `sup_company`;
+CREATE TABLE `sup_company`  (
+                                `customerId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+                                `companyName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称',
+                                `bussinessStatus` int NULL DEFAULT NULL COMMENT '企业类型：1.生产企业；2.经营企业；',
+                                `creditNum` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '统一社会信用代码',
+                                `classes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `area` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '地址',
+                                `detailAddr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '详细地址',
+                                `appId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '应用码x',
+                                `appSecret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '授权码x',
+                                `contacts` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系人',
+                                `mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系电话',
+                                `tel` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电话',
+                                `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '邮箱',
+                                `areaCode` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `refEntId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业唯一标识x',
+                                `entId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业IDx',
+                                `networkType` int NULL DEFAULT NULL COMMENT '入网标识【0非入网1入网2入驻马上放心】x',
+                                `certIdFk` int NULL DEFAULT NULL COMMENT '绑定appkey外键IDx',
+                                `parentCompany` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属总部x',
+                                `parentIdFk` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属总部Idx',
+                                `contactsPapersType` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '法人证件类型：1：身份证',
+                                `contactsPapersCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '法人证件号码',
+                                `registerStatus` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出',
+                                `jyxkzh` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经营许可证号（Ⅲ类）',
+                                `jyxkzfzjg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经营许可证发证机关',
+                                `jyxkzyxq` date NULL DEFAULT NULL COMMENT '经营许可证有效期至',
+                                `jybapzh` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经营备案凭证号（Ⅱ类）',
+                                `jybabm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '经营备案部门',
+                                `fzrq` date NULL DEFAULT NULL COMMENT '发证日期',
+                                `suihao` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '税号',
+                                `kaihuhang` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开户行',
+                                `kaihuzhanghao` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开户账号',
+                                `auditStatus` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过',
+                                `filePath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '文件路径',
+                                `filePath2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '文件路径',
+                                `filePath3` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '文件路径',
+                                `filePath4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '文件路径',
+                                `unitIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '往来单位外键',
+                                `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+                                `createBy` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+                                `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+                                `auditTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
+                                `auditComment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核意见',
+                                `editStatus` tinyint NULL DEFAULT NULL COMMENT '保存状态（1.草稿保存，2.已提交保存)',
+                                PRIMARY KEY (`customerId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sup_manufacturer
+-- ----------------------------
+DROP TABLE IF EXISTS `sup_manufacturer`;
+CREATE TABLE `sup_manufacturer`  (
+                                     `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT,
+                                     `manufacturerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业ID主键',
+                                     `companyName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称',
+                                     `creditCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '统一社会信用代码',
+                                     `companyType` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业类型：1：注册人/备案人，2：代理人',
+                                     `placeArea` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所在地区：省市区',
+                                     `placeAreaCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所在地区代码',
+                                     `placeAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所在地址：详细地址',
+                                     `legalPersonName` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '法人姓名',
+                                     `legalPersonPapersType` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '法人证件类型：1：身份证',
+                                     `legalPersonPapersCode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '法人证件号码',
+                                     `productionArea` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产地区：省市区',
+                                     `productionAreaCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产地区代码',
+                                     `productionAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产地址：详细地址',
+                                     `registerStatus` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '登记状态：1：续存（在营，开业，在册），2：吊销，3：注销，4：迁出',
+                                     `productionLicenceNum` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械生产许可证号',
+                                     `productionLicenceDate` date NULL DEFAULT NULL COMMENT '医疗器械生产许可证有效期至',
+                                     `productionRecordNum` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械生产备案凭证号',
+                                     `productionRecordSection` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械经营备案凭证号\n发证机关/备案部门',
+                                     `productionRecordDate` date NULL DEFAULT NULL COMMENT '医疗器械生产备案凭证号发证日期',
+                                     `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+                                     `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+                                     `update_date` date NULL DEFAULT NULL COMMENT '更新时间',
+                                     `customerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '往来单位ID主键',
+                                     `auditStatus` tinyint NULL DEFAULT NULL COMMENT '审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过',
+                                     `auditComment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '拒绝说明',
+                                     PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for sup_product
+-- ----------------------------
+DROP TABLE IF EXISTS `sup_product`;
+CREATE TABLE `sup_product`  (
+                                `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT,
+                                `productId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID',
+                                `enterpriseId` bigint UNSIGNED NULL DEFAULT NULL,
+                                `recordCode` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案号',
+                                `recordProductName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案产品名称',
+                                `productManageType` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '医疗器械管理类别（Ⅰ类、Ⅱ类、Ⅲ类）',
+                                `recordPeopleName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案人名称',
+                                `recordPeopleArea` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册人住所地区：省市区',
+                                `recordPeopleAreaCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册人住所地区代码',
+                                `recordPeopleAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册人住所地址：详细地址',
+                                `productType` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '器械类别（器械或诊断试剂）',
+                                `productDirectoryCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '器械目录分类编码',
+                                `agentName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '代理人名称',
+                                `agentArea` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '代理人住所地区：省市区',
+                                `agentAreaCode` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '代理人住所地区代码',
+                                `agentAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '代理人住所地址：详细地址',
+                                `instructions` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '说明书附件',
+                                `productAddress` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产地址',
+                                `recordText` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案证电子档案',
+                                `placeOrigin` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产地 国产 进口 港澳台',
+                                `productionRegion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产国或地区',
+                                `productionCompanyName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产厂商名称',
+                                `afterSale` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '售后服务机构',
+                                `specification` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号',
+                                `structure` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '结构及组成',
+                                `scope` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '适用范围',
+                                `other` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '其它内容',
+                                `filePath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册证/备案凭证电子档 文件地址',
+                                `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+                                `create_date` date NULL DEFAULT NULL COMMENT '创建时间',
+                                `update_date` date NULL DEFAULT NULL COMMENT '更新时间',
+                                `manufacturerIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产企业Id',
+                                `customerId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '往来单位ID',
+                                `auditStatus` tinyint NULL DEFAULT NULL,
+                                `auditComment` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `sptm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `ybbm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                `cpms` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+DROP INDEX `uniqueKey` ON inv_prein_product;
+alter table inv_prein_product add UNIQUE uniqueKey(`orderIdFk`);
+
+
+ALTER TABLE `thr_order`
+    ADD COLUMN `thirdPartyDate` tinyint(0) NULL DEFAULT NULL COMMENT '判断来源至哪里1：第三方 2：自己创建' AFTER `manufactory`;
+
+
+
+ALTER TABLE `sup_cert`
+    ADD COLUMN `status` tinyint(0) NULL   DEFAULT NULL   COMMENT '0：启用，1:禁用';
+
+ALTER TABLE `sup_company`
+    ADD COLUMN `status` tinyint(0) NULL   DEFAULT NULL   COMMENT '0：启用，1:禁用';
+
+ALTER TABLE `sup_product`
+    ADD COLUMN `relIdFk` VARCHAR(64) NULL   DEFAULT NULL   COMMENT '耗材字典关联主键';
+
+
+alter table company Add column createTime datetime(0) DEFAULT NULL COMMENT '创建时间';
+alter table company Add column createBy VARCHAR(64) DEFAULT NULL COMMENT '创建人';
+alter table company Add column updateTime datetime(0) DEFAULT NULL COMMENT '更新时间';
+alter table company Add column auditTime datetime(0) DEFAULT NULL COMMENT '审核时间';
+alter table company Add column auditComment VARCHAR(1024) DEFAULT NULL COMMENT '审核意见';
+alter table company Add column editStatus TINYINT NULL DEFAULT NULL COMMENT '保存状态（1.草稿保存，2.已提交保存)';
+
+
+