From 1424110868b17aa726058d807ab7a7d0105ce3bd Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 10 Nov 2022 14:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadController.java | 11 +++ .../basic/SpsSyncDownloadService.java | 84 +++++++++++++++++++ .../basic/SpsSyncExportStatusController.java | 3 + .../CompanyProductRelevanceController.java | 31 +++++-- .../inout/StockOrderDetailController.java | 26 +++--- .../purechase/PurApplyController.java | 11 ++- .../purechase/PurPlanController.java | 7 +- .../purechase/SupCertController.java | 3 + .../purechase/SupManufacturerController.java | 8 +- .../purechase/SupProductController.java | 12 +-- .../thrsys/ThrProductsAddDiController.java | 14 ++++ .../admin/dao/purchase/PurPlanDetailDao.java | 2 +- .../admin/dao/purchase/SupProductDao.java | 2 + .../admin/entity/param/SyncDataSetEntity.java | 4 + .../admin/entity/purchase/PurApplyEntity.java | 5 +- .../admin/entity/purchase/PurPlanEntity.java | 2 +- .../purchase/SupManufacturerEntity.java | 4 +- .../entity/purchase/SupProductEntity.java | 4 +- .../req/purchase/FilterSupCertRequest.java | 3 + .../req/purchase/FilterSupCompanyRequest.java | 4 +- .../admin/req/purchase/PurApplyRequest.java | 7 +- .../req/thrsys/FilterThrProductsRequest.java | 1 + .../res/basic/BasicUnitMaintainResponse.java | 4 +- .../admin/res/basic/SpsSyncDataResponse.java | 12 +++ .../admin/res/param/SyncDataSetResponse.java | 3 + .../admin/res/purchase/PurApplyResponse.java | 6 +- .../admin/res/purchase/PurPlanResponse.java | 2 +- .../impl/InvSubWarehouseServiceImpl.java | 2 + .../service/purchase/SupProductService.java | 2 + .../purchase/impl/SupProductServiceImpl.java | 13 +++ .../thread/BasicBackUpdateProductService.java | 4 + .../main/resources/application-dev.properties | 2 +- .../mybatis/mapper/param/SyncDataSetDao.xml | 8 +- .../mybatis/mapper/purchase/PurApplyDao.xml | 9 +- .../mybatis/mapper/purchase/SupCompanyDao.xml | 9 +- .../mapper/purchase/SupManufacturerDao.xml | 25 +++--- .../mybatis/mapper/purchase/SupProductDao.xml | 57 ++++++++++++- .../mapper/thrsys/ThrProductsAddDiDao.xml | 10 ++- 38 files changed, 340 insertions(+), 76 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index 7bec885..eeb4001 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/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); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 374ada1..9ae67cc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/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 newUploadDiEntities = newUploadDiService.filterNewUploads(filterNewUploadDiRequest); syncDataResponse.setNewUploadDiEntities(newUploadDiEntities); + + //资质证书 + List supCertEntityList = new ArrayList<>(); + + //获取供应商资质证书 + FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest); + filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); + List supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest); + syncDataResponse.setSupCompanyEntities(supCompanyEntities); + if (CollUtil.isNotEmpty(supCompanyEntities)) { + for (SupCompanyEntity supCompanyEntity : supCompanyEntities) { + List 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 supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + syncDataResponse.setSupManufacturerEntities(supManufacturerEntities); + if (CollUtil.isNotEmpty(supManufacturerEntities)) { + for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) { + List 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 supProductEntities = supProductService.filterProducts(filterPoductRequest); + syncDataResponse.setSupProductEntities(supProductEntities); + + + if (CollUtil.isNotEmpty(supProductEntities)) { + for (SupProductEntity supProductEntity : supProductEntities) { + List 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 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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index 8ad47bd..aa569c8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/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) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java index bdb2a8e..2e04390 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java +++ b/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 temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + companyProductRelevanceRequest.setUuid(temps.get(0).getUuid()); + companyProductRelevanceRequest.setNameCode(null); + companyProductRelevanceRequest.setUnionCode(null); + } + } + + List 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 basicInstrumentMaintainRelevanceResponses = null; companyProductRelevanceRequest.setDiType(1); basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); - String rlidStr=udiInfoExportRequest.getRlIds().get(0); - for (CompanyProductRelevanceResponse obj:basicInstrumentMaintainRelevanceResponses){ - String rlid=String.valueOf(obj.getRlId()); - if(rlid.equals(rlidStr)){ - return ResultVOUtils.error(999,"该企业已选择该产品，请勿重复选择！"); + String rlidStr = udiInfoExportRequest.getRlIds().get(0); + for (CompanyProductRelevanceResponse obj : basicInstrumentMaintainRelevanceResponses) { + String rlid = String.valueOf(obj.getRlId()); + if (rlid.equals(rlidStr)) { + return ResultVOUtils.error(999, "该企业已选择该产品，请勿重复选择！"); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index cb666ef..8bf1575 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/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 udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); - pageInfo2 = new PageInfo<>(udiRelevanceResponses); - if (!pageInfo2.getList().isEmpty()) { - basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size()); - for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) { - CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); - BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse); - companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId()); - basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse); - } - } +// List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); +// pageInfo2 = new PageInfo<>(udiRelevanceResponses); +// if (!pageInfo2.getList().isEmpty()) { +// basicInstrumentMaintainRelevanceResponses = new ArrayList<>(pageInfo2.getList().size()); +// for (UdiRelevanceResponse udiRelevanceResponse : pageInfo2.getList()) { +// CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); +// BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse); +// companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId()); +// basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse); +// } +// } + + companyProductRelevanceRequest.setCustomerId(null); + basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); } } else { basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest); - } PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.java index 57ee907..fa698b2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.java +++ b/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.setInvWarehouseCode(purApplyEntity.getInvWarehouseCode()); + purPlanEntity.setLocStorageCode(purApplyEntity.getTargetInv()); + purPlanEntity.setInvWarehouseCode(purApplyEntity.getTargetSubInv()); + purPlanEntity.setBillType(purApplyEntity.getTargetBillType()); purPlanEntity.setDeptCode(purApplyEntity.getDeptCode()); purPlanEntity.setCreateBy(purApplyEntity.getAuditBy()); purPlanEntity.setCreateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java index aa338f4..d920d6f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java @@ -171,9 +171,10 @@ public class PurPlanController { List 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()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java index 1b60d64..f6844fd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java index ed7bca4..b569f07 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java +++ b/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.setUpdateDate(new Date()); + supManufacturerEntity.setCreateTime(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 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java index 26e61fa..640b139 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java +++ b/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.setUpdate_date(new Date()); + supProductEntity.setCreateTime(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.setUpdate_date(new Date()); + supProductEntity.setCreateTime(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) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index 5e1b4b1..6d79a57 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/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 temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + filterThrProductsRequest.setUuid(temps.get(0).getUuid()); + filterUdiInfoRequest.setNameCode(null); + } + } + filterThrProductsRequest.setDiType(1); List thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest); PageInfo pageInfo = new PageInfo<>(thrProductsAddDiResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurPlanDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurPlanDetailDao.java index b274251..00f8e77 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurPlanDetailDao.java +++ b/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 ids); + Boolean deleteByIds(@Param("ids")List ids); Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java index a465c8e..fee4463 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java @@ -17,6 +17,8 @@ public interface SupProductDao { List getRegistration(FilterPoductRequest filterPoductRequest); + List filterProducts(FilterPoductRequest filterPoductRequest); + boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java index 306f099..a8efd2a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurApplyEntity.java index 33dfce7..331307f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurApplyEntity.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurPlanEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurPlanEntity.java index dd60789..aa17fda 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurPlanEntity.java +++ b/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; /** * 申购说明 */ diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java index 24aa8d4..f500382 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java +++ b/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 updateDate; + private Date createTime; + private Date updateTime; private String customerId; private String manufacturerId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java index 2d5b5a9..6f43bea 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java +++ b/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 update_date; + private Date createTime; + private Date updateTime; private String newFilePath; private String newInstructions; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java index 2c48591..b759ce0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java index 15bca9b..f452350 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java +++ b/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 auditStatusList; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java index 3849053..7b6f3dc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java +++ b/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; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java index e64c15b..930f69f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicUnitMaintainResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicUnitMaintainResponse.java index 0f6b20e..1e589a2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicUnitMaintainResponse.java +++ b/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 int outType; + private Integer corpType; + private Integer outType; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index cdf77ce..6454d86 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/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 newUploadDiEntities; + + //资质证书 + List supCompanyEntities; + List supManufacturerEntities; + List supProductEntities; + List supCertEntities; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java index 29b36e7..ef751e6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/param/SyncDataSetResponse.java +++ b/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; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java index 47d9562..014886c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurPlanResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurPlanResponse.java index 1257d27..a0c3481 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurPlanResponse.java +++ b/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; /** * 申购说明 */ diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index f2c2f6e..ff6b1b0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java index 5899f47..a7aad2a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java @@ -21,6 +21,8 @@ public interface SupProductService { List getRegistration(FilterPoductRequest filterPoductRequest); + List filterProducts(FilterPoductRequest filterPoductRequest); + boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java index 9e5e08e..fd7191b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java +++ b/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 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 supProductEntities = supProductDao.filterProducts(filterPoductRequest); + return supProductEntities; + } + @Override public boolean modifyRegistration(SupProductEntity companyEntity) { return supProductDao.modifyRegistration(companyEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 9db4ffe..84dceec 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/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()); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 62b651c..d3db546 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/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 diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml index 1b7879d..236dc8e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml +++ b/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} ) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index a2298bf..8005538 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/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} ) @@ -104,6 +106,9 @@ createTime=#{createTime}, updateTime=#{updateTime}, auditRemark=#{auditRemark}, + targetInv=#{targetInv}, + targetSubInv=#{targetSubInv}, + targetBillType=#{targetBillType}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index eb3d568..28ae5a4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -44,6 +44,9 @@ and unitIdFk = #{unitIdFk} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + @@ -151,9 +154,9 @@ INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area, - detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, - auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, - editStatus) + detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, + auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, + editStatus) values (#{companyName}, #{bussinessStatus}, #{creditNum}, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index a428eb5..7c7b7f0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -29,7 +29,7 @@ and manufacturerId = #{manufacturerId} - and companyName like concat('%',#{companyName},'%') + and sup_manufacturer.companyName like concat('%',#{companyName},'%') and creditCode like concat('%',#{creditCode},'%') @@ -56,6 +56,9 @@ and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 ) + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + @@ -83,8 +86,8 @@ productionRecordSection=#{productionRecordSection}, productionRecordDate=#{productionRecordDate}, remark=#{remark}, - create_date=#{createDate}, - update_date=#{updateDate}, + createTime=#{createTime}, + updateTime=#{updateTime}, customerId=#{customerId}, manufacturerId=#{manufacturerId}, auditStatus=#{auditStatus}, @@ -98,20 +101,20 @@ INSERT INTO sup_manufacturer(companyName, creditCode, companyType, - placeArea, placeAreaCode, placeAddress, - legalPersonName, legalPersonPapersType, legalPersonPapersCode, - productionArea, productionAreaCode, productionAddress, - registerStatus, productionLicenceNum, productionLicenceDate, - productionRecordNum, productionRecordSection, productionRecordDate, - remark, create_date, update_date, customerId, manufacturerId, - auditStatus, auditComment) + placeArea, placeAreaCode, placeAddress, + legalPersonName, legalPersonPapersType, legalPersonPapersCode, + productionArea, productionAreaCode, productionAddress, + registerStatus, productionLicenceNum, productionLicenceDate, + productionRecordNum, productionRecordSection, productionRecordDate, + remark, createTime, updateTime, customerId, manufacturerId, + 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}) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index 0ce2d45..02d8458 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -17,6 +17,55 @@ where recordProductName = #{recordProductName} + + + + + -