Merge remote-tracking branch 'origin/busUser' into zhairh

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

@@ -105,6 +105,10 @@ public class BussinessTypeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        if(StrUtil.isNotEmpty(bussinessTypeFilterRequest.getIds())){
+            List<String> idList = new ArrayList<>(Arrays.asList(bussinessTypeFilterRequest.getIds().split(",")));
+            bussinessTypeFilterRequest.setActionList(idList);
+        }
 
         if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) {
             BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction());

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

@@ -1376,6 +1376,13 @@ public class WareHouseController {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id);
+        FilterInvBusUserRequest filterInvBusUserRequest=new FilterInvBusUserRequest();
+        filterInvBusUserRequest.setScAction(warehouseBussinessTypeEntity.getAction());
+        filterInvBusUserRequest.setSubInvCode(warehouseBussinessTypeEntity.getCode());
+        List<InvBusUserEntity> invBusUserEntityList=invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        if(invBusUserEntityList.size()>0){
+            return  ResultVOUtils.error(999,"有用户关联该单据请先移除再进行删除！");
+        }
 
         InvSubWarehouseEntity invSubWarehouseEntity =
                 invSubWarehouseService.findByInvSubByCode(warehouseBussinessTypeEntity.getCode());

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

@@ -92,10 +92,15 @@ public class InvSubWarehouseController {
                 // 查询总库信息
                 InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
                 //查询仓库信息
-                InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
+                //查询仓库信息
+                if(invSubWarehouseEntity!=null){
+                    InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
                     filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
                     filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
                     filterInvWarehouseRequest.setCode(null);
+                }else {
+                    return  ResultVOUtils.error(999,"分库编号为空！");
+                }
 
             }else {
                 //允许调拨

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

@@ -54,6 +54,14 @@ public class SupCertSetController {
         if (supCertSetEntity == null) {
             supCertSetEntity = new SupCertSetEntity();
         }
+        //判断名字存在就返回
+        FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest();
+        filterCertSetsRequest.setType(supCertSetEntity.getType());
+        filterCertSetsRequest.setName(supCertSetEntity.getName());
+        List<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
+        if(supCertEntityList.size()>0){
+            return  ResultVOUtils.error(999,"该证书名称已存在！");
+        }
         supCertSetEntity.setUpdateTime(new Date());
         if(supCertSetEntity.getType()==3){
             if(supCertSetEntity.getFlbmList().size()>0){
@@ -73,6 +81,12 @@ public class SupCertSetController {
             String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(","));
             supCertSetEntity.setFlbm(flbm);
         }
+        //判断名字存在就返回
+        FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest();
+        filterCertSetsRequest.setType(supCertSetEntity.getType());
+        filterCertSetsRequest.setName(supCertSetEntity.getName());
+        List<SupCertSetEntity> supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest);
+      
         boolean b = supCertSetService.updateCertSet(supCertSetEntity);
         return ResultVOUtils.success("修改成功");
     }

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

@@ -104,12 +104,20 @@ public class SupCompanyController {
     public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) {
         if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) {
 
+            //判断是不是存在草稿
+            List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
+            for(SupCertEntity obj:supCertEntityList){
+                if(obj.getAuditStatus()==0){
+                    return  ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
+                }
+            }
+
             //提交审核
             FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
             filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
             filterCertSetsRequest.setNeed(1);
             List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
-            List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
+
             //验证
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
@@ -154,6 +162,41 @@ public class SupCompanyController {
     public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) {
 
 
+        if(companyEntity.getAuditStatus()==1){
+            //查询用户上传的证书
+            FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+            filterSupCertRequest.setCustomerId(companyEntity.getCustomerId());
+            filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
+            List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
+
+            //查询用户该上传的证书
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
+            filterCertSetsRequest.setNeed(1);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+
+            //验证
+            ListIterator<SupCertSetEntity> iterable1 = supCertSetEntities.listIterator();
+            while (iterable1.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable1.next();
+                if (supCertSetEntity.isNeed()) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable1.remove();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                return ResultVOUtils.error(500, "必传证书不齐全！");
+            }
+        }
+
         //查询是否包含审核未通过的证书
         if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS
                 || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) {

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

@@ -17,6 +17,7 @@ import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
 import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
+import com.glxp.api.admin.service.info.CompanyService;
 import com.glxp.api.admin.service.purchase.SupCertService;
 import com.glxp.api.admin.service.purchase.SupCertSetService;
 import com.glxp.api.admin.service.purchase.SupCompanyService;
@@ -51,7 +52,8 @@ public class SupManufacturerController {
     private SupCompanyService supCompanyService;
     @Resource
     SupCertSetService supCertSetService;
-
+    @Resource
+    private CompanyService companyService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sup/manufacturer/getCompanyInfo")
@@ -91,9 +93,21 @@ public class SupManufacturerController {
     @PostMapping("/sup/manufacturer/addCompany")
     public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
 
-
+        //判断用户名和社会信用代码不能重复
-
+        FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
-
+        filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if(companyEntities.size()>0){
+            return ResultVOUtils.error(999,"企业名称不能重复！");
+        }
+        filterSupManufacturerRequest=new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
+        companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if(companyEntities.size()>0){
+            return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
+        }
         //提交审核
         if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
             //判断是否上级供应商是否审核通过
@@ -109,27 +123,28 @@ public class SupManufacturerController {
             filterCertSetsRequest.setNeed(0);
             List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
             List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+            //判断存在有草稿的未提交的就不能通过
+            for(SupCertEntity obj:supCertEntityList){
+                if (obj.getAuditStatus() == 0.) {
+                    return  ResultVOUtils.error(999,"资质证书存在草稿不能提交！");
+                }
+            }
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
 
-                if (supCertSetEntity.isNeed()
+                if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
-                        ||
-                        (!supCertSetEntity.isNeed() &&
-                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
                         && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed() &&
+                        (
                                 supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
                                         && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed()
+                        (       supCertSetEntity.getForeign() != null
-                                && supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 1
                                 && supManufacturerEntity.getCompanyType().equals("1"))
                         ||
-                        (!supCertSetEntity.isNeed()
+                        (       supCertSetEntity.getForeign() != null
-                                && supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 3
                                 && supManufacturerEntity.getCompanyType().equals("1"))) {
                     for (SupCertEntity supCertEntity : supCertEntityList) {
@@ -176,6 +191,23 @@ public class SupManufacturerController {
         if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
             return ResultVOUtils.error(500, "参数错误！");
         }
+
+        //判断用户名和社会信用代码不能重复
+        FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if(companyEntities.size()>0){
+            return ResultVOUtils.error(999,"企业名称不能重复！");
+        }
+        filterSupManufacturerRequest=new FilterSupManufacturerRequest();
+        filterSupManufacturerRequest.setCustomerId(getCustomerId());
+        filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
+        companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
+        if(companyEntities.size()>0){
+            return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
+        }
+
         //提交审核
         if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
             //判断是否上级供应商是否审核通过
@@ -191,27 +223,28 @@ public class SupManufacturerController {
             filterCertSetsRequest.setNeed(0);
             List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
             List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+            //判断存在有草稿的未提交的就不能通过
+            for(SupCertEntity obj:supCertEntityList){
+                if (obj.getAuditStatus() == 0.) {
+                    return  ResultVOUtils.error(999,"资质证书存在草稿不能提交！");
+                }
+            }
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
 
-                if (supCertSetEntity.isNeed()
+                if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
-                        ||
-                        (!supCertSetEntity.isNeed() &&
-                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
                         && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed() &&
+                        (
                                 supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
                                         && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
                         ||
-                        (!supCertSetEntity.isNeed()
+                        (       supCertSetEntity.getForeign() != null
-                                && supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 1
                                 && supManufacturerEntity.getCompanyType().equals("1"))
                         ||
-                        (!supCertSetEntity.isNeed()
+                        (       supCertSetEntity.getForeign() != null
-                                && supCertSetEntity.getForeign() != null
                                 && supCertSetEntity.getForeign() == 3
                                 && supManufacturerEntity.getCompanyType().equals("1"))) {
                     for (SupCertEntity supCertEntity : supCertEntityList) {
@@ -262,6 +295,59 @@ public class SupManufacturerController {
         if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
             return ResultVOUtils.error(500, "参数错误！");
         }
+
+
+
+        if(supManufacturerEntity.getAuditStatus()==2){
+            //查询上传的资质证书
+            FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+            filterSupCertRequest.setCustomerId(supManufacturerEntity.getCustomerId());
+            filterSupCertRequest.setManufacturerIdFk(supManufacturerEntity.getManufacturerId());
+            filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER);
+            List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
+            //查询必须上传的资质证书
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+            //判断有没有存在必须上传而没有上传的证书
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
+
+                if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
+                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                        ||
+                        (
+                                supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
+                                        && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                        ||
+                        (       supCertSetEntity.getForeign() != null
+                                && supCertSetEntity.getForeign() == 1
+                                && supManufacturerEntity.getCompanyType().equals("1"))
+                        ||
+                        (       supCertSetEntity.getForeign() != null
+                                && supCertSetEntity.getForeign() == 3
+                                && 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) {
+                return ResultVOUtils.error(500, "必传证书不齐全！");
+            }
+        }
+
+
         //  查询是否包含审核未通过的证书
         if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS ||
                 supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) {

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

@@ -124,8 +124,9 @@ public class SupProductController {
             ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
-
+                if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
-                if (supCertSetEntity.getImports() == 1|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
+                        || StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
+                        || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
                         && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
@@ -204,9 +205,15 @@ public class SupProductController {
         if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) {
             return ResultVOUtils.error(500, "参数错误！");
         }
-
+        //判断是不是存在草稿
+        List<SupCertEntity> supCertEntityList1 = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
+        for(SupCertEntity obj:supCertEntityList1){
+            if(obj.getAuditStatus()==0){
+                return  ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
+            }
+        }
         //提交审核
-        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
+
             //判断是否上级供应商是否审核通过
 
             SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
@@ -224,12 +231,14 @@ public class SupProductController {
             while (iterable.hasNext()) {
                 SupCertSetEntity supCertSetEntity = iterable.next();
 
-                if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
+                if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
+                        || StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
+                        || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
                         && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
                         || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
                         || (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
-                        || (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
+                        || StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
                 ) {
                     for (SupCertEntity supCertEntity : supCertEntityList) {
                         if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
@@ -242,8 +251,6 @@ public class SupProductController {
                 } else {
                     iterable.remove();
                 }
-
-
             }
             String errMsg = "";
             if (supCertSetEntities.size() > 0) {
@@ -253,7 +260,7 @@ public class SupProductController {
                 return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
             }
 
-        }
+
         supProductEntity.setUpdateTime(new Date());
         SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId());
         supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(),
@@ -274,7 +281,53 @@ public class SupProductController {
         if (supProductEntity.getAuditStatus() == null) {
             return ResultVOUtils.error(500, "参数错误！");
         }
+        if(supProductEntity.getAuditStatus()==1){
+            //查询用户上传的证书
+            FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+            filterSupCertRequest.setCustomerId(supProductEntity.getCustomerId());
+            filterSupCertRequest.setManufacturerIdFk(supProductEntity.getManufacturerIdFk());
+            filterSupCertRequest.setProductIdFk(supProductEntity.getProductId());
+            filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT);
+            List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
+
+            //查询用户该上传的证书
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
 
+                if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
+                        || StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
+                        || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
+                        && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
+                        || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
+                        || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
+                        || (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
+                        || StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
+                ) {
+                    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, "必传证书不齐全");
+            }
+        }
 
         //  查询是否包含审核未通过的证书
         if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS ||

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

@@ -21,4 +21,6 @@ public interface SupManufacturerDao {
     boolean insertCompany(SupManufacturerEntity supManufacturerEntity);
 
     boolean deleteById(@Param("id") String id);
+
+    List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest);
 }

api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java

@@ -13,4 +13,5 @@ public class CompanyEntity {
     private String classes;     //企业类别         //企业类别：1.生产企业，2.流通企业，3。医疗机构
     private String appId;
     private String appSecret;
+    private String auditComment;
 }

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

@@ -36,5 +36,5 @@ public class SupManufacturerEntity {
     private Integer auditStatus;
     private String supName;
     private String auditComment;
-
+    private Integer auditType;
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java

@@ -38,7 +38,8 @@ public class ThrOrderEntity {
     private String locStorageCode;
     private Integer editStatus;
     private String invWarehouseCode;
-
+    private String invWarehouseName;
+    private String fromSubInvName;
     private String unitIdFk;
     private int allocateStatus;     //1:已配货；0：未配货
 

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

@@ -8,6 +8,7 @@ public class BasicBusTypeChangeRequest extends ListPageRequest {
 
     private String originAction;
     private Boolean enable;
+    private String originName;
     private Integer type;
     private String lastUpdateTime;
 }

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

@@ -15,6 +15,8 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private Boolean spUse;
     private Boolean isFilter;
     private String code;
+    private String invWarehouseCode;
     private Integer userId;
     private String lastUpdateTime;
+    private Integer type;
 }

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

@@ -13,6 +13,6 @@ public class FilterSupManufacturerRequest extends ListPageRequest {
     private String customerId;
     private Integer auditStatus;
     private String manufacturerId;
-
+    private Integer type;
     private String lastUpdateTime;
 }

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

@@ -100,4 +100,7 @@ public class PurApplyRequest extends ListPageRequest {
     private String targetSubInv;
     private String targetBillType;
 
+    private String startDate;
+    private String endDate;
+
 }

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

@@ -92,5 +92,8 @@ public class PurPlanRequest extends ListPageRequest {
      */
     private Date createTime;
 
+    private String startDate;
+    private String endDate;
+
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.admin.req.receipt;
 import com.glxp.api.admin.req.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class BussinessTypeFilterRequest extends ListPageRequest {
 
@@ -28,5 +30,7 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String locSubInvCode;
     private String lastUpdateTime;
     private String code;
+    private String ids;
+    private List<String> actionList;
 
 }

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

@@ -32,9 +32,27 @@ public class ErpOrderResponse {
     private String remark1; //备注1
     private String remark2; //备注2
     private String remark3; //备注3
+    private String invWarehouseName;
+    private String fromSubInvName;
 
     private String billTypeName;
 
+    public String getInvWarehouseName() {
+        return invWarehouseName;
+    }
+
+    public void setInvWarehouseName(String invWarehouseName) {
+        this.invWarehouseName = invWarehouseName;
+    }
+
+    public String getFromSubInvName() {
+        return fromSubInvName;
+    }
+
+    public void setFromSubInvName(String fromSubInvName) {
+        this.fromSubInvName = fromSubInvName;
+    }
+
     public String getBillNo() {
         return billNo;
     }

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

@@ -53,8 +53,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
     @Override
     public void saveWarehouseBussinessType(String code, List<BussinessTypResponse> bussinessTypResponseList) {
 
-        //删除旧数据
+
-        warehouseBussinessTypeDao.deleteByCode(code);
 
         if (CollUtil.isNotEmpty(bussinessTypResponseList)) {
             List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = new ArrayList<>(bussinessTypResponseList.size());

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

@@ -23,4 +23,7 @@ public interface SupManufacturerService {
 
     boolean deleteById(String id);
 
+    List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest);
+
+
 }

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

@@ -72,4 +72,9 @@ public class SupManufacturerServiceImpl implements SupManufacturerService {
     public boolean deleteById(String id) {
         return supManufacturerDao.deleteById(id);
     }
+
+    @Override
+    public List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest) {
+        return supManufacturerDao.getCompanyByNameAndCode(filterSupManufacturerRequest);
+    }
 }

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

@@ -31,6 +31,9 @@
             <if test="originAction != ''and originAction != null">
                 AND basic_bustype_change.originAction = #{originAction}
             </if>
+            <if test="originName != ''and originName != null">
+                AND basic_bustype_change.originName = #{originName}
+            </if>
             <if test="enable != null">
                 AND basic_bustype_change.`enable` = #{enable}
             </if>

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

@@ -96,6 +96,7 @@
             <if test="spUse != ''and spUse != null">
                 AND basic_bustype_local.spUse =#{spUse}
             </if>
+
         </where>
         group by basic_bussiness_type.action
 
@@ -161,9 +162,15 @@
             <if test="code != ''and code != null">
                 AND inv_warehouse_user.`code` = #{code}
             </if>
+            <if test="invWarehouseCode != ''and invWarehouseCode != null">
+                AND inv_warehouse_sub.`code` = #{invWarehouseCode}
+            </if>
             <if test="userId != ''and userId != null">
                 AND inv_bustype_user.`userId` = #{userId}
             </if>
+            <if test="type != null">
+                AND  inv_bustype_user.subInvCode = #{code}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>

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

@@ -115,7 +115,11 @@
             <if test="secCheckEnable != ''and secCheckEnable != null">
                 AND basic_bussiness_type.secCheckEnable =#{secCheckEnable}
             </if>
-
+            <if test="actionList != null and actionList.size() >0">
+                <foreach collection="actionList" item="action" open="AND (" separator="AND" close=")">
+                    basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR}
+                </foreach>
+            </if>
         </where>
         order by basic_bussiness_type.`index`
     </select>

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

@@ -16,7 +16,12 @@
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
             </if>
-
+            <if test="startDate != null and startDate !=''">
+                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
+            </if>
+            <if test="endDate != null and endDate !=''">
+                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
             <if test="status!=null and status!=10 and status!=11">
                 and pur_apply.status = #{status}
             </if>

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

@@ -32,6 +32,7 @@
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
+                AND basic_products.diType=1
             </if>
             <if test="productId != null">
                 AND productId = #{productId}

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

@@ -17,7 +17,12 @@
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}
             </if>
-
+            <if test="startDate != null and startDate !=''">
+                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
+            </if>
+            <if test="endDate != null and endDate !=''">
+                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
             <if test="status!=null and status!=10 and status!=11">
                 and pur_plan.status = #{status}
             </if>

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

@@ -32,6 +32,7 @@
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
+                AND basic_products.diType=1
             </if>
             <if test="productId != null">
                 AND productId = #{productId}

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

@@ -19,7 +19,7 @@
             <if test="type != '' and type!=null">
                 and `type` = #{type}
             </if>
-            <if test="auditStatus != null  and auditStatus !=23 and auditStatus !=24">
+            <if test="auditStatus != null  and auditStatus !=20 and auditStatus !=24 and auditStatus !=25" >
                 and auditStatus = #{auditStatus}
             </if>
             <if test="auditStatus ==20">
@@ -28,6 +28,9 @@
             <if test="auditStatus ==24">
                 and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6)
             </if>
+            <if test="auditStatus ==25">
+                and (auditStatus !=0)
+            </if>
 
         </where>
         ORDER BY id DESC
@@ -68,8 +71,8 @@
             <if test="remark != null">remark=#{remark},</if>
             <if test="createTime != null">createTime=#{createTime},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
-            <if test="vailDate != null">vailDate=#{vailDate},</if>
+            vailDate=#{vailDate},
-            <if test="expireDate != null">expireDate=#{expireDate},</if>
+            expireDate=#{expireDate},
             <if test="type != null">`type`=#{type},</if>
             <if test="manufacturerIdFk != null">`manufacturerIdFk`=#{manufacturerIdFk},</if>
             <if test="productIdFk != null">`productIdFk`=#{productIdFk},</if>

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

@@ -16,6 +16,7 @@
             <if test="need!=null">
                 and `need` = #{need}
             </if>
+
         </where>
         ORDER BY id DESC
     </select>

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

@@ -22,7 +22,7 @@
         SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer
         inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
         <where>
-            <if test="id != null and id != ''">
+            <if test="id != null and id != '' and type==null">
                 and id = #{id}
             </if>
             <if test="manufacturerId != null and manufacturerId != ''">
@@ -59,6 +59,9 @@
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
+            <if test="type != null">
+                and id != #{id}
+            </if>
         </where>
     </select>
 
@@ -113,7 +116,7 @@
                 #{productionArea}, #{productionAreaCode}, #{productionAddress},
                 #{registerStatus}, #{productionLicenceNum}, #{productionLicenceDate},
                 #{productionRecordNum}, #{productionRecordSection}, #{productionRecordDate},
-                #{remark}, #{createTime}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus},
+                #{remark}, #{createTime}, #{updateTime}, #{customerId}, #{manufacturerId}, #{auditStatus},
                 #{auditComment})
     </insert>
 
@@ -123,4 +126,25 @@
         WHERE id = #{id}
     </delete>
 
+    <select id="getCompanyByNameAndCode" parameterType="com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest"
+            resultType="com.glxp.api.admin.entity.purchase.SupManufacturerEntity">
+        SELECT sup_manufacturer.* ,company.companyName as supName FROM sup_manufacturer
+        inner join company on sup_manufacturer.customerId = company.customerId
+        <where>
+            <if test="companyName != null and companyName != ''">
+                and sup_manufacturer.companyName = #{companyName}
+            </if>
+            <if test="creditCode != null and creditCode != ''">
+                and creditCode = #{creditCode}
+            </if>
+
+            <if test="customerId != null and customerId != ''">
+                and sup_manufacturer.customerId = #{customerId}
+            </if>
+            <if test="type != null">
+                and id != #{id}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -56,8 +56,10 @@
 
     <select id="filterReceiveOrder" parameterType="com.glxp.api.admin.req.thrsys.FilterThrOrderRequest"
             resultType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
-        SELECT thr_order.*,basic_bustype_change.originName billTypeName FROM thr_order
+        SELECT thr_order.*,basic_bustype_change.originName billTypeName,s1.name as invWarehouseName,s2.name as fromSubInvName  FROM thr_order
         left join basic_bustype_change on thr_order.billType = basic_bustype_change.originAction
+        LEFT JOIN inv_warehouse_sub s1 ON thr_order.invWarehouseCode=s1.`code`
+        LEFT JOIN inv_warehouse_sub s2 ON thr_order.fromSubInvCode=s2.`code`
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}