采购管理相关功能bug修改

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

@@ -75,6 +75,17 @@ public class SpsSyncDownloadController {
 
             if (CollUtil.isNotEmpty(baseResponse.getData().getNewUploadDiEntities()))
                 logs = logs + "新增配送产品信息：" + baseResponse.getData().getNewUploadDiEntities().size() + "条\n";
+
+
+            if (CollUtil.isNotEmpty(baseResponse.getData().getSupCompanyEntities()))
+                logs = logs + "配送企业资质证书：" + baseResponse.getData().getSupCompanyEntities().size() + "条\n";
+            if (CollUtil.isNotEmpty(baseResponse.getData().getSupManufacturerEntities()))
+                logs = logs + "生产企业资质证书：" + baseResponse.getData().getThrProductsEntities().size() + "条\n";
+            if (CollUtil.isNotEmpty(baseResponse.getData().getSupCompanyEntities()))
+                logs = logs + "产品资质证书：" + baseResponse.getData().getThrProductsEntities().size() + "条\n";
+            if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities()))
+                logs = logs + "资质证书：" + baseResponse.getData().getSupCertEntities().size() + "条\n";
+
             basicExportStatusEntity.setRemark(logs);
             basicExportService.updateExportStatus(basicExportStatusEntity);
 

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

@@ -14,6 +14,10 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
+import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
+import com.glxp.sale.admin.entity.purchase.SupProductEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
@@ -23,6 +27,10 @@ import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
 import com.glxp.sale.admin.req.inout.OrderFilterRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.sale.admin.req.purchase.FilterPoductRequest;
+import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
+import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest;
+import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.sale.admin.req.thrsys.*;
 import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse;
@@ -40,6 +48,10 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService;
 import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SyncDataSetService;
+import com.glxp.sale.admin.service.purchase.SupCertService;
+import com.glxp.sale.admin.service.purchase.SupCompanyService;
+import com.glxp.sale.admin.service.purchase.SupManufacturerService;
+import com.glxp.sale.admin.service.purchase.SupProductService;
 import com.glxp.sale.admin.service.receipt.ProductInfoService;
 import com.glxp.sale.admin.service.thrsys.*;
 import com.glxp.sale.admin.util.BeanUtils;
@@ -99,6 +111,17 @@ public class SpsSyncDownloadService {
     @Resource
     NewUploadDiService newUploadDiService;
 
+
+    @Resource
+    SupCompanyService supCompanyService;
+    @Resource
+    SupManufacturerService supManufacturerService;
+    @Resource
+    SupProductService supProductService;
+    @Resource
+    SupCertService supCertService;
+
+
     public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) {
 
         SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
@@ -269,9 +292,64 @@ public class SpsSyncDownloadService {
         List<NewUploadDiEntity> newUploadDiEntities = newUploadDiService.filterNewUploads(filterNewUploadDiRequest);
         syncDataResponse.setNewUploadDiEntities(newUploadDiEntities);
 
+
+        //资质证书
+        List<SupCertEntity> supCertEntityList = new ArrayList<>();
+
+        //获取供应商资质证书
+        FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
+        BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest);
+        filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+        List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest);
+        syncDataResponse.setSupCompanyEntities(supCompanyEntities);
+        if (CollUtil.isNotEmpty(supCompanyEntities)) {
+            for (SupCompanyEntity supCompanyEntity : supCompanyEntities) {
+                List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId());
+                if (CollUtil.isNotEmpty(tempsList)) {
+                    supCertEntityList.addAll(tempsList);
+                }
+            }
+        }
+
+
+        //获取生产企业资质证书
+        FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
+        BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest);
+        filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+        List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
+        syncDataResponse.setSupManufacturerEntities(supManufacturerEntities);
+        if (CollUtil.isNotEmpty(supManufacturerEntities)) {
+            for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) {
+                List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
+                if (CollUtil.isNotEmpty(tempsList)) {
+                    supCertEntityList.addAll(tempsList);
+                }
+            }
+        }
+
+
+        //获取产品资质证书
+        FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
+        BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest);
+        filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
+        List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest);
+        syncDataResponse.setSupProductEntities(supProductEntities);
+
+
+        if (CollUtil.isNotEmpty(supProductEntities)) {
+            for (SupProductEntity supProductEntity : supProductEntities) {
+                List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
+                if (CollUtil.isNotEmpty(tempsList)) {
+                    supCertEntityList.addAll(tempsList);
+                }
+            }
+        }
+        syncDataResponse.setSupCertEntities(supCertEntityList);
+
         return ResultVOUtils.success(syncDataResponse);
     }
 
+
     //单据类型
     @Resource
     BussinessTypeService bussinessTypeService;
@@ -289,12 +367,16 @@ public class SpsSyncDownloadService {
 
         SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
         SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
+
+        //扫码单据类型
         if (syncDataSetEntity.isTypeScan()) {
             BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest);
             List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest);
             spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
         }
+
+        //业务单据类型
         if (syncDataSetEntity.isTypeBus()) {
             BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
             BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest);
@@ -334,6 +416,8 @@ public class SpsSyncDownloadService {
                 spsSyncBusResponse.setEntrustReceEntities(dlEntrustReceEntities);
             }
         }
+
+
         return ResultVOUtils.success(spsSyncBusResponse);
     }
 

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

@@ -191,6 +191,9 @@ public class SpsSyncExportStatusController {
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList())
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getDeptEntityList())
                         || CollUtil.isNotEmpty(spsSyncDataResponse.getNewUploadDiEntities())
+                        || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities())
+                        || CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities())
+                        || CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities())
                 ) {
                     BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA);
                     if (basicExportStatusTimeEntity != null) {

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

@@ -12,6 +12,7 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest;
+import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.SupplementRequest;
 import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
 import com.glxp.sale.admin.req.info.CompanyRequest;
@@ -19,13 +20,16 @@ import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest;
 import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
+import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.BasicProductSetService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.thread.CompanyProductsRelService;
+import com.glxp.sale.admin.util.FilterUdiUtils;
 import com.glxp.sale.admin.util.SupplementVailUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -57,6 +61,8 @@ public class CompanyProductRelevanceController {
     CompanyService companyService;
     @Resource
     private BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    private UdiRelevanceService udiRelevanceService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/company/product/relevance/filter")
@@ -66,6 +72,19 @@ public class CompanyProductRelevanceController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
+            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+            filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                companyProductRelevanceRequest.setUuid(temps.get(0).getUuid());
+                companyProductRelevanceRequest.setNameCode(null);
+                companyProductRelevanceRequest.setUnionCode(null);
+            }
+        }
+
+
         List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         companyProductRelevanceRequest.setDiType(1);
         basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
@@ -185,16 +204,16 @@ public class CompanyProductRelevanceController {
             udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk());
         }
         //查询本企业有没有选择该产品有选择不能选择
-        CompanyProductRelevanceRequest companyProductRelevanceRequest=new CompanyProductRelevanceRequest();
+        CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
         companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId());
         List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         companyProductRelevanceRequest.setDiType(1);
         basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
-        String rlidStr=udiInfoExportRequest.getRlIds().get(0);
+        String rlidStr = udiInfoExportRequest.getRlIds().get(0);
-        for (CompanyProductRelevanceResponse obj:basicInstrumentMaintainRelevanceResponses){
+        for (CompanyProductRelevanceResponse obj : basicInstrumentMaintainRelevanceResponses) {
-            String rlid=String.valueOf(obj.getRlId());
+            String rlid = String.valueOf(obj.getRlId());
-            if(rlid.equals(rlidStr)){
+            if (rlid.equals(rlidStr)) {
-                return ResultVOUtils.error(999,"该企业已选择该产品，请勿重复选择！");
+                return ResultVOUtils.error(999, "该企业已选择该产品，请勿重复选择！");
             }
         }
 

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

@@ -520,21 +520,23 @@ public class StockOrderDetailController {
                 companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
                 basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
             } else {
-                List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+//                List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
-                pageInfo2 = new PageInfo<>(udiRelevanceResponses);
+//                pageInfo2 = new PageInfo<>(udiRelevanceResponses);
-                if (!pageInfo2.getList().isEmpty()) {
+//                if (!pageInfo2.getList().isEmpty()) {
-                    basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size());
+//                    basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size());
-                    for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) {
+//                    for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) {
-                        CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
+//                        CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
-                        BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
+//                        BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
-                        companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
+//                        companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
-                        basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
+//                        basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
-                    }
+//                    }
-                }
+//                }
+
+                companyProductRelevanceRequest.setCustomerId(null);
+                basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
             }
         } else {
             basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
-
         }
 
         PageInfo<CompanyProductRelevanceResponse> pageInfo;

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.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 com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.annotation.RepeatSubmit;
@@ -26,6 +27,7 @@ import com.glxp.sale.admin.util.OrderNoTypeBean;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -90,6 +92,7 @@ public class PurApplyController {
             for (StockOrderDetailEntity stockOrderDetailEntity : postPurApplyRequest.getSubErpOrders()) {
                 PurApplyDetailEntity purApplyDetailEntity = new PurApplyDetailEntity();
                 BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity);
+                purApplyDetailEntity.setCount(StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? 0 : Integer.parseInt(stockOrderDetailEntity.getCount()));
                 purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + "");
                 purApplyDetailService.insert(purApplyDetailEntity);
             }
@@ -158,15 +161,15 @@ public class PurApplyController {
         purApplyService.update(purApplyEntity);
 
         //审核通过后转换成采购计划单
-        if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED) {
+        if (purApplyEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED && StrUtil.isNotEmpty(purApplyEntity.getTargetBillType())) {
             PurPlanEntity purPlanEntity = new PurPlanEntity();
             String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"));
-
             purPlanEntity.setBillNo(billNo);
             purPlanEntity.setBillDate(new Date());
             purPlanEntity.setStatus(ConstantStatus.APPLY_UN_AUDIT);
-            purPlanEntity.setLocStorageCode(purApplyEntity.getLocStorageCode());
+            purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv());
-            purPlanEntity.setInvWarehouseCode(purApplyEntity.getInvWarehouseCode());
+            purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv());
+            purPlanEntity.setBillType(purApplyEntity.getTargetBillType());
             purPlanEntity.setDeptCode(purApplyEntity.getDeptCode());
             purPlanEntity.setCreateBy(purApplyEntity.getAuditBy());
             purPlanEntity.setCreateTime(new Date());

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

@@ -171,9 +171,10 @@ public class PurPlanController {
 
         List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + "");
 
-        //转换成业务单据
-        if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) {
 
+        BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(purApplyEntity.getBillType());
+        //转换成业务单据
+        if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED && basicBusTypeChangeEntity != null && basicBusTypeChangeEntity.getTargetBusAction() != null) {
 
             if (CollUtil.isNotEmpty(purPlanDetailEntities)) {
                 //1.根据供应商分组
@@ -203,8 +204,6 @@ public class PurPlanController {
                     stockOrderEntity.setCorpName(basicUnitMaintainEntity.getName());
                     stockOrderEntity.setBilldate(DateUtil.formatDateTime(new Date()));
                     stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);
-                    //todo
-                    BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction("purplan");
                     stockOrderEntity.setBillType(basicBusTypeChangeEntity.getTargetBusAction());
                     stockOrderEntity.setInvWarehouseCode(purApplyEntity.getInvWarehouseCode());
                     stockOrderEntity.setLocStorageCode(purApplyEntity.getLocStorageCode());

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

@@ -145,15 +145,18 @@ public class SupCertController {
             if (postSupCertRequest.getType() == ConstantStatus.CERT_COMPANY) {
                 SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supCertEntity.getCustomerId());
                 supCompanyEntity.setAuditStatus(ConstantStatus.AUDIT_CHANGE);
+                supCompanyEntity.setUpdateTime(new Date());
                 supCompanyService.modifyCompany(supCompanyEntity);
             } else if (postSupCertRequest.getType() == ConstantStatus.CERT_MANUFACTURER) {
                 SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supCertEntity.getManufacturerIdFk());
                 supManufacturerEntity.setAuditStatus(ConstantStatus.AUDIT_CHANGE);
+                supManufacturerEntity.setUpdateTime(new Date());
                 supManufacturerService.modifyCompany(supManufacturerEntity);
             } else if (postSupCertRequest.getType() == ConstantStatus.CERT_PRODUCT) {
                 SupProductResponse supProductResponse = supProductService.findByProductId(supCertEntity.getProductIdFk());
                 SupProductEntity supProductEntity = new SupProductEntity();
                 supProductEntity.setId(supProductResponse.getId());
+                supProductEntity.setUpdateTime(new Date());
                 supProductEntity.setAuditStatus(ConstantStatus.AUDIT_CHANGE);
                 supProductService.modifyRegistration(supProductEntity);
             }

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

@@ -94,8 +94,8 @@ public class SupManufacturerController {
             supManufacturerEntity.setCustomerId(customerId);
         }
 
-        supManufacturerEntity.setCreateDate(new Date());
+        supManufacturerEntity.setCreateTime(new Date());
-        supManufacturerEntity.setUpdateDate(new Date());
+        supManufacturerEntity.setUpdateTime(new Date());
         boolean b = supManufacturerService.insertCompany(supManufacturerEntity);
         if (b) {
             return ResultVOUtils.success("添加成功");
@@ -167,7 +167,7 @@ public class SupManufacturerController {
         }
 
 
-        supManufacturerEntity.setUpdateDate(new Date());
+        supManufacturerEntity.setUpdateTime(new Date());
         SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId());
         boolean b = supManufacturerService.modifyCompany(supManufacturerEntity);
         //修改证书对应的供应商ID，生产企业ID
@@ -205,7 +205,7 @@ public class SupManufacturerController {
             }
         }
 
-        supManufacturerEntity.setUpdateDate(new Date());
+        supManufacturerEntity.setUpdateTime(new Date());
         SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId());
         boolean b = supManufacturerService.modifyCompany(supManufacturerEntity);
         //修改证书对应的供应商ID，生产企业ID

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

@@ -97,8 +97,8 @@ public class SupProductController {
     @AuthRuleAnnotation("")
     @PostMapping("/sup/product/addRegistration")
     public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) {
-        supProductEntity.setCreate_date(new Date());
+        supProductEntity.setCreateTime(new Date());
-        supProductEntity.setUpdate_date(new Date());
+        supProductEntity.setUpdateTime(new Date());
         boolean b = supProductService.insertRegistration(supProductEntity);
         if (b) {
             return ResultVOUtils.success("添加成功");
@@ -125,8 +125,8 @@ public class SupProductController {
         supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
         supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
         supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
-        supProductEntity.setCreate_date(new Date());
+        supProductEntity.setCreateTime(new Date());
-        supProductEntity.setUpdate_date(new Date());
+        supProductEntity.setUpdateTime(new Date());
         supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
         supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
         supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
@@ -201,7 +201,7 @@ public class SupProductController {
                 return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
             }
         }
-        supProductEntity.setUpdate_date(new Date());
+        supProductEntity.setUpdateTime(new Date());
         SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId());
         supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(),
                 supProductEntity.getManufacturerIdFk(), originEntity.getProductId(), supProductEntity.getProductId());
@@ -240,7 +240,7 @@ public class SupProductController {
 //                return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！");
             }
         }
-        supProductEntity.setUpdate_date(new Date());
+        supProductEntity.setUpdateTime(new Date());
         boolean b = supProductService.modifyRegistration(supProductEntity);
 
 //        if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) {

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

@@ -14,11 +14,13 @@ import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.CombineRequest;
+import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.SupplementRequest;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.basic.NewUploadDiService;
@@ -28,6 +30,7 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService;
 import com.glxp.sale.admin.util.BeanUtils;
+import com.glxp.sale.admin.util.FilterUdiUtils;
 import com.glxp.sale.admin.util.SupplementVailUtil;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
@@ -85,6 +88,17 @@ public class ThrProductsAddDiController {
         if (!customerId.equals("110")) {
             filterThrProductsRequest.setCustomerId(customerId);
         }
+
+        if (StrUtil.isNotEmpty(filterThrProductsRequest.getCode())) {
+            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+            filterUdiInfoRequest.setNameCode(filterThrProductsRequest.getCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                filterThrProductsRequest.setUuid(temps.get(0).getUuid());
+                filterUdiInfoRequest.setNameCode(null);
+            }
+        }
+        filterThrProductsRequest.setDiType(1);
         List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest);
         PageInfo<ThrProductsAddDiResponse> pageInfo = new PageInfo<>(thrProductsAddDiResponses);
         PageSimpleResponse<ThrProductsAddDiResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -18,7 +18,7 @@ public interface PurPlanDetailDao {
 
     Boolean update(PurPlanDetailEntity purPlanDetailRequest);
 
-    Boolean deleteByIds(List<Long> ids);
+    Boolean deleteByIds(@Param("ids")List<Long> ids);
 
     Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
 

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

@@ -17,6 +17,8 @@ public interface SupProductDao {
 
     List<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest);
 
+    List<SupProductEntity> filterProducts(FilterPoductRequest filterPoductRequest);
+
     boolean modifyRegistration(SupProductEntity supProductEntity);
 
     boolean insertRegistration(SupProductEntity supProductEntity);

api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java

@@ -32,4 +32,8 @@ public class SyncDataSetEntity {
     private String basicSyncStart;
     private boolean entrustAction;
 
+
+    private boolean unCheckCert;
+    private boolean checkedCert;
+
 }

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

@@ -35,7 +35,7 @@ public class PurApplyEntity {
     /**
      * 申购类型
      */
-    private Long billType;
+    private String billType;
     /**
      * 申购说明
      */
@@ -72,4 +72,7 @@ public class PurApplyEntity {
 
     private String auditRemark;
 
+    private String targetInv;
+    private String targetSubInv;
+    private String targetBillType;
 }

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

@@ -35,7 +35,7 @@ public class PurPlanEntity {
     /**
      * 申购类型
      */
-    private Integer billType;
+    private String billType;
     /**
      * 申购说明
      */

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

@@ -28,8 +28,8 @@ public class SupManufacturerEntity {
     private String productionRecordSection;
     private Date productionRecordDate;
     private String remark;
-    private Date createDate;
+    private Date createTime;
-    private Date updateDate;
+    private Date updateTime;
     private String customerId;
     private String manufacturerId;
 

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

@@ -38,8 +38,8 @@ public class SupProductEntity {
     private String filePath;
     private String remark;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date create_date;
+    private Date createTime;
-    private Date update_date;
+    private Date updateTime;
 
     private String newFilePath;
     private String newInstructions;

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

@@ -13,4 +13,7 @@ public class FilterSupCertRequest extends ListPageRequest {
     private String productIdFk;
     private Integer auditStatus;
     private Integer type;
+
+    private String lastUpdateTime;
+
 }

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

@@ -11,8 +11,8 @@ public class FilterSupCompanyRequest extends ListPageRequest {
     private String customerId;
     private String companyName;
     private String creditNum;
-    private String auditStatus;
+    private Integer auditStatus;
     private String unitIdFk;
-
+    private String lastUpdateTime;
     private List<String> auditStatusList;
 }

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

@@ -45,7 +45,7 @@ public class PurApplyRequest extends ListPageRequest {
      * 申购类型
      */
     @NotNull(message = "申购类型不能为空")
-    private Integer billType;
+    private String billType;
 
     /**
      * 申购说明
@@ -94,4 +94,9 @@ public class PurApplyRequest extends ListPageRequest {
     private Date createTime;
 
 
+    private String targetInv;
+    private String targetSubInv;
+    private String targetBillType;
+
+
 }

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

@@ -27,4 +27,5 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private String ybbm;
     private Long id;
     private String uuid;
+    private Integer diType;
 }

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

@@ -18,7 +18,7 @@ public class BasicUnitMaintainResponse {
     private String mobile;
     private String thirdName;
     private String unitId;
-    private int corpType;
+    private Integer corpType;
-    private int outType;
+    private Integer outType;
 
 }

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

@@ -12,6 +12,10 @@ import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.entity.purchase.SupCertEntity;
+import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
+import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
+import com.glxp.sale.admin.entity.purchase.SupProductEntity;
 import com.glxp.sale.admin.entity.thrsys.*;
 import lombok.Data;
 
@@ -52,4 +56,12 @@ public class SpsSyncDataResponse {
     //新增配送产品信息
     List<NewUploadDiEntity> newUploadDiEntities;
 
+
+    //资质证书
+    List<SupCompanyEntity> supCompanyEntities;
+    List<SupManufacturerEntity> supManufacturerEntities;
+    List<SupProductEntity> supProductEntities;
+    List<SupCertEntity> supCertEntities;
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java

@@ -33,5 +33,8 @@ public class SyncDataSetResponse {
     private boolean entrustAction;
     private Integer delaySyncTime;
 
+    private boolean unCheckCert;
+    private boolean checkedCert;
+
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java

@@ -27,7 +27,7 @@ public class PurApplyResponse {
     /**
      * 申购类型
      */
-    private Long billType;
+    private String billType;
     /**
      * 申购说明
      */
@@ -68,4 +68,8 @@ public class PurApplyResponse {
     private String invName;
     private String subInvName;
     private String auditRemark;
+
+    private String targetInv;
+    private String targetSubInv;
+    private String targetBillType;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurPlanResponse.java

@@ -26,7 +26,7 @@ public class PurPlanResponse {
     /**
      * 申购类型
      */
-    private Integer billType;
+    private String billType;
     /**
      * 申购说明
      */

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

@@ -193,6 +193,8 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
 
     @Override
     public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) {
+        if (code == null)
+            return null;
         return invSubWarehouseDao.filterGroupInvSubAndcode(code);
     }
 

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

@@ -21,6 +21,8 @@ public interface SupProductService {
 
     List<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest);
 
+    List<SupProductEntity> filterProducts(FilterPoductRequest filterPoductRequest);
+
     boolean modifyRegistration(SupProductEntity supProductEntity);
 
     boolean insertRegistration(SupProductEntity supProductEntity);

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

@@ -85,6 +85,19 @@ public class SupProductServiceImpl implements SupProductService {
         return companyEntities;
     }
 
+    @Override
+    public List<SupProductEntity> filterProducts(FilterPoductRequest filterPoductRequest) {
+        if (filterPoductRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterPoductRequest.getPage() != null) {
+            int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit();
+            PageHelper.offsetPage(offset, filterPoductRequest.getLimit());
+        }
+        List<SupProductEntity> supProductEntities = supProductDao.filterProducts(filterPoductRequest);
+        return supProductEntities;
+    }
+
     @Override
     public boolean modifyRegistration(SupProductEntity companyEntity) {
         return supProductDao.modifyRegistration(companyEntity);

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

@@ -326,6 +326,10 @@ public class BasicBackUpdateProductService {
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities())
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getAuthAdminList())
                     || CollUtil.isNotEmpty(spsSyncDataResponse.getDeptEntityList())
+                    || CollUtil.isNotEmpty(spsSyncDataResponse.getNewUploadDiEntities())
+                    || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities())
+                    || CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities())
+                    || CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities())
             ) {
                 BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
                 basicExportStatusEntity.setId(CustomUtil.getId());

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

@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000

api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml

@@ -16,7 +16,8 @@
         INTO sync_data_set(id,typeBus, typeScan,
         typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
         , basicThirdBusOrder, orderScanFinish,  dbDiProducts,downstreamEnable,syncTime,
-        orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction)
+        orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
+        ,unCheckCert,checkedCert)
         values (
         #{id},
         #{typeBus},
@@ -39,7 +40,10 @@
         #{sysUser},
         #{orderSyncTime},
         #{orderSyncStart},
-        #{basicSyncStart},#{entrustAction}
+        #{basicSyncStart},
+        #{entrustAction},
+        #{unCheckCert},
+        #{checkedCert}
         )
     </insert>
 

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

@@ -52,7 +52,7 @@
         INTO  pur_apply
         (
         billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode,
-        deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark
+        deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType
         )
         values (
         #{billNo},
@@ -68,7 +68,9 @@
         #{auditBy},
         #{auditTime},
         #{updateTime},
-        #{auditRemark}
+        #{auditRemark},
+        #{targetInv},
+        #{targetSubInv},#{targetBillType}
         )
     </insert>
 
@@ -104,6 +106,9 @@
             <if test="createTime != null">createTime=#{createTime},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="auditRemark != null">auditRemark=#{auditRemark},</if>
+            <if test="targetInv != null">targetInv=#{targetInv},</if>
+            <if test="targetSubInv != null">targetSubInv=#{targetSubInv},</if>
+            <if test="targetBillType != null">targetBillType=#{targetBillType},</if>
 
         </trim>
         WHERE id = #{id}

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

@@ -44,6 +44,9 @@
             <if test="unitIdFk != null and unitIdFk != ''">
                 and unitIdFk = #{unitIdFk}
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
         </where>
     </select>
     <delete id="deleteCompany" parameterType="java.lang.Long">
@@ -151,9 +154,9 @@
 
     <insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
         INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area,
-                                      detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
+                            detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
-                                      auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment,
+                            auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment,
-                                      editStatus)
+                            editStatus)
         values (#{companyName},
                 #{bussinessStatus},
                 #{creditNum},

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

@@ -29,7 +29,7 @@
                 and manufacturerId = #{manufacturerId}
             </if>
             <if test="companyName != null and companyName != ''">
-                and companyName like concat('%',#{companyName},'%')
+                and sup_manufacturer.companyName like concat('%',#{companyName},'%')
             </if>
             <if test="creditCode != null and creditCode != ''">
                 and creditCode like concat('%',#{creditCode},'%')
@@ -56,6 +56,9 @@
             <if test="auditStatus ==22">
                 and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
             </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
 
         </where>
     </select>
@@ -83,8 +86,8 @@
             <if test="productionRecordSection != null">productionRecordSection=#{productionRecordSection},</if>
             <if test="productionRecordDate != null">productionRecordDate=#{productionRecordDate},</if>
             <if test="remark != null">remark=#{remark},</if>
-            <if test="createDate != null">create_date=#{createDate},</if>
+            <if test="createTime != null">createTime=#{createTime},</if>
-            <if test="updateDate != null">update_date=#{updateDate},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="customerId != null">customerId=#{customerId},</if>
             <if test="manufacturerId != null">manufacturerId=#{manufacturerId},</if>
             <if test="auditStatus != null">auditStatus=#{auditStatus},</if>
@@ -98,20 +101,20 @@
 
     <insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
         INSERT INTO sup_manufacturer(companyName, creditCode, companyType,
-                                               placeArea, placeAreaCode, placeAddress,
+                                     placeArea, placeAreaCode, placeAddress,
-                                               legalPersonName, legalPersonPapersType, legalPersonPapersCode,
+                                     legalPersonName, legalPersonPapersType, legalPersonPapersCode,
-                                               productionArea, productionAreaCode, productionAddress,
+                                     productionArea, productionAreaCode, productionAddress,
-                                               registerStatus, productionLicenceNum, productionLicenceDate,
+                                     registerStatus, productionLicenceNum, productionLicenceDate,
-                                               productionRecordNum, productionRecordSection, productionRecordDate,
+                                     productionRecordNum, productionRecordSection, productionRecordDate,
-                                               remark, create_date, update_date, customerId, manufacturerId,
+                                     remark, createTime, updateTime, customerId, manufacturerId,
-                                               auditStatus, auditComment)
+                                     auditStatus, auditComment)
         values (#{companyName}, #{creditCode}, #{companyType},
                 #{placeArea}, #{placeAreaCode}, #{placeAddress},
                 #{legalPersonName}, #{legalPersonPapersType}, #{legalPersonPapersCode},
                 #{productionArea}, #{productionAreaCode}, #{productionAddress},
                 #{registerStatus}, #{productionLicenceNum}, #{productionLicenceDate},
                 #{productionRecordNum}, #{productionRecordSection}, #{productionRecordDate},
-                #{remark}, #{createDate}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus},
+                #{remark}, #{createTime}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus},
                 #{auditComment})
     </insert>
 

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

@@ -17,6 +17,55 @@
         where recordProductName = #{recordProductName}
     </select>
 
+
+    <select id="filterProducts" parameterType="com.glxp.sale.admin.req.purchase.FilterPoductRequest"
+            resultType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
+        SELECT sup_product.* FROM sup_product
+        <where>
+            <if test="id != null and id != ''">
+                and sup_product.id = #{id}
+            </if>
+            <if test="productId != null and productId != ''">
+                and sup_product.productId = #{productId}
+            </if>
+            <if test="enterpriseId != null and enterpriseId != ''">
+                and sup_product.enterpriseId = #{enterpriseId}
+            </if>
+            <if test="recordCode != null and recordCode != ''">
+                and sup_product.recordCode like concat('%',#{recordCode},'%')
+            </if>
+            <if test="recordProductName != null and recordProductName != ''">
+                and sup_product.recordProductName like concat('%',#{recordProductName},'%')
+            </if>
+            <if test="recordPeopleName != null and recordPeopleName != ''">
+                and sup_product.recordPeopleName like concat('%',#{recordPeopleName},'%')
+            </if>
+            <if test="manufacturerIdFk != null and manufacturerIdFk != ''">
+                and sup_product.manufacturerIdFk = #{manufacturerIdFk}
+            </if>
+            <if test="customerId != null and customerId != ''">
+                and sup_product.customerId = #{customerId}
+            </if>
+            <if test="auditStatus != null and auditStatus !=20 and auditStatus !=22 and auditStatus !=21">
+                and sup_product.auditStatus = #{auditStatus}
+            </if>
+            <if test="auditStatus ==20">
+                and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or
+                sup_product.auditStatus=2)
+            </if>
+            <if test="auditStatus ==21">
+                and <![CDATA[ sup_product.auditStatus <> 0 ]]>
+            </if>
+            <if test="auditStatus ==22">
+                and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 )
+            </if>
+            <if test="lastUpdateTime!=null and lastUpdateTime!=''">
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+            </if>
+        </where>
+    </select>
+
+
     <select id="getRegistration" parameterType="com.glxp.sale.admin.req.purchase.FilterPoductRequest"
             resultType="com.glxp.sale.admin.res.purchase.SupProductResponse">
         SELECT sup_product.* ,company.companyName
@@ -102,8 +151,8 @@
             <if test="other != null">other=#{other},</if>
             <if test="filePath != null">filePath=#{filePath},</if>
             <if test="remark != null">remark=#{remark},</if>
-            <if test="create_date != null">create_date=#{create_date},</if>
+            <if test="createTime != null">createTime=#{createTime},</if>
-            <if test="update_date != null">update_date=#{update_date},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="manufacturerIdFk != null">manufacturerIdFk=#{manufacturerIdFk},</if>
             <if test="customerId != null">customerId=#{customerId},</if>
             <if test="productId != null">productId=#{productId},</if>
@@ -131,7 +180,7 @@
                                 productionRegion, productionCompanyName, afterSale,
                                 specification, structure, `scope`,
                                 other, filePath, remark,
-                                create_date, update_date, manufacturerIdFk, customerId, productId
+                                createTime, updateTime, manufacturerIdFk, customerId, productId
             , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb)
         values (#{enterpriseId}, #{recordCode}, #{recordProductName},
                 #{productManageType}, #{recordPeopleName}, #{recordPeopleArea},
@@ -142,7 +191,7 @@
                 #{productionRegion}, #{productionCompanyName}, #{afterSale},
                 #{specification}, #{structure}, #{scope},
                 #{other}, #{filePath}, #{remark},
-                #{create_date}, #{update_date}, #{manufacturerIdFk}, #{customerId}, #{productId}
+                #{createTime}, #{updateTime}, #{manufacturerIdFk}, #{customerId}, #{productId}
                    , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms}, #{hchzsb})
     </insert>
 

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

@@ -71,14 +71,14 @@
         where id = #{id}
     </delete>
 
-    <select id="filterThrProductsGetId" parameterType="integer" resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity">
+    <select id="filterThrProductsGetId" parameterType="integer"
+            resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity">
         select *
         from thr_products_add_di
         where id = #{id}
     </select>
 
 
-
     <select id="filterThrProductsList" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse">
         SELECT tdi.*,
@@ -86,7 +86,7 @@
         p.cpmctymc,
         p.ggxh,
         p.ylqxzcrbarmc,
-        p.zczbhhzbapzbh,tdi.selectThridSysStr
+        p.zczbhhzbapzbh
         FROM thr_products_add_di tdi
         LEFT JOIN productinfo p ON tdi.uuid = p.uuid
         <where>
@@ -114,8 +114,12 @@
             <if test="uuid != '' and uuid != null">
                 AND tdi.uuid = #{uuid}
             </if>
+            <if test="diType != '' and diType != null">
+                AND p.diType = #{diType}
+            </if>
         </where>
         order by tdi.createTime DESC
+
     </select>
 
     <select id="getDiProductDetail" resultType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">