From 37dfdc87a3656715d0527e613642344c491bc85a Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 10 Nov 2022 11:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/StockOrderDetailController.java | 25 +++--- .../CompanyProductRelevanceController.java | 21 ++++- .../purchase/PurApplyController.java | 11 ++- .../purchase/PurPlanController.java | 6 +- .../purchase/SupCertController.java | 3 + .../purchase/SupManufacturerController.java | 8 +- .../purchase/SupProductController.java | 12 +-- .../admin/dao/purchase/PurPlanDetailDao.java | 2 +- .../api/admin/dao/purchase/SupProductDao.java | 2 + .../admin/entity/info/SyncDataSetEntity.java | 3 + .../admin/entity/purchase/PurApplyEntity.java | 6 +- .../admin/entity/purchase/PurPlanEntity.java | 2 +- .../purchase/SupManufacturerEntity.java | 4 +- .../entity/purchase/SupProductEntity.java | 4 +- .../req/purchase/FilterSupCertRequest.java | 2 + .../req/purchase/FilterSupCompanyRequest.java | 4 +- .../admin/req/purchase/PurApplyRequest.java | 6 +- .../req/thrsys/FilterThrProductsRequest.java | 1 + .../res/basic/BasicUnitMaintainResponse.java | 4 +- .../admin/res/basic/SpsSyncDataResponse.java | 10 +++ .../admin/res/info/SyncDataSetResponse.java | 4 + .../admin/res/purchase/PurApplyResponse.java | 2 +- .../admin/res/purchase/PurPlanResponse.java | 2 +- .../service/purchase/SupProductService.java | 2 + .../purchase/impl/SupProductServiceImpl.java | 13 ++++ .../mybatis/mapper/info/SyncDataSetDao.xml | 17 ++-- .../mybatis/mapper/purchase/PurApplyDao.xml | 9 ++- .../mybatis/mapper/purchase/SupCompanyDao.xml | 11 ++- .../mapper/purchase/SupManufacturerDao.xml | 26 ++++--- .../mybatis/mapper/purchase/SupProductDao.xml | 77 +++++++++++++++---- 30 files changed, 212 insertions(+), 87 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index 5e05b495..64286c3c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -501,17 +501,20 @@ 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); + } PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java index 653123a3..03716ef9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java @@ -10,13 +10,16 @@ import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.basic.UdiInfoExportRequest; import com.glxp.api.admin.req.info.CompanyRequest; import com.glxp.api.admin.req.info.DeleteCompanyFileRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.CompanyService; import com.glxp.api.admin.thread.CompanyProductsRelService; @@ -50,6 +53,9 @@ public class CompanyProductRelevanceController { @Resource private BasicUnitMaintainService basicUnitMaintainService; + @Resource + private UdiRelevanceService udiRelevanceService; + @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest, @@ -58,6 +64,17 @@ 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); @@ -153,8 +170,8 @@ public class CompanyProductRelevanceController { @AuthRuleAnnotation("") @PostMapping("/sale/info/insertFilter") public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { - if(StrUtil.isEmpty(udiInfoExportRequest.getUnitFk())){ - return ResultVOUtils.error(500,"未选择供应商！"); + if (StrUtil.isEmpty(udiInfoExportRequest.getUnitFk())) { + return ResultVOUtils.error(500, "未选择供应商！"); } companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); return ResultVOUtils.success("后台正在导入，请稍后刷新查看！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java index 78fc2833..d908a636 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurApplyController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.annotation.RepeatSubmit; @@ -27,6 +28,7 @@ import com.glxp.api.admin.util.OrderNoTypeBean; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.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.*; @@ -91,6 +93,7 @@ public class PurApplyController { for (StockOrderDetailEntity stockOrderDetailEntity : postPurApplyRequest.getSubErpOrders()) { PurApplyDetailEntity purApplyDetailEntity = new PurApplyDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity); + purApplyDetailEntity.setCount(stockOrderDetailEntity.getCount()); purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + ""); purApplyDetailService.insert(purApplyDetailEntity); } @@ -159,15 +162,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/api/admin/controller/purchase/PurPlanController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java index 01d51ba0..24cad7c0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/PurPlanController.java @@ -172,9 +172,9 @@ public class PurPlanController { List purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + ""); + BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(purApplyEntity.getBillType()); //转换成业务单据 - if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED) { - + if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED && basicBusTypeChangeEntity != null && basicBusTypeChangeEntity.getTargetBusAction() != null) { if (CollUtil.isNotEmpty(purPlanDetailEntities)) { //1.根据供应商分组 @@ -204,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/api/admin/controller/purchase/SupCertController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java index 86872e80..abb2316e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCertController.java @@ -147,15 +147,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/api/admin/controller/purchase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java index 7d347394..099ba779 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java @@ -90,8 +90,8 @@ public class SupManufacturerController { @AuthRuleAnnotation("") @PostMapping("/sup/manufacturer/addCompany") public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { - 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("添加成功"); @@ -163,7 +163,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 @@ -202,7 +202,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/api/admin/controller/purchase/SupProductController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java index edea7d6a..1402b7df 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java @@ -104,8 +104,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("添加成功"); @@ -132,8 +132,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()); @@ -206,7 +206,7 @@ public class SupProductController { } } - 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()); @@ -249,7 +249,7 @@ public class SupProductController { } - 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/api/admin/dao/purchase/PurPlanDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java index 9adbddaa..5dd22518 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/PurPlanDetailDao.java @@ -20,7 +20,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/api/admin/dao/purchase/SupProductDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java index 4ebdcde0..446ce1c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupProductDao.java @@ -19,6 +19,8 @@ public interface SupProductDao { boolean modifyRegistration(SupProductEntity supProductEntity); + List filterProducts(FilterPoductRequest filterPoductRequest); + boolean insertRegistration(SupProductEntity supProductEntity); boolean deleteById(@Param("id") String id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java index c4a64bc5..4f4db835 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java @@ -32,4 +32,7 @@ public class SyncDataSetEntity { private Integer orderSyncTime; private Integer orderSyncDlTime; + private boolean unCheckCert; + private boolean checkedCert; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java index d61b2d98..6e3b8049 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurApplyEntity.java @@ -35,7 +35,7 @@ public class PurApplyEntity { /** * 申购类型 */ - private Long billType; + private String billType; /** * 申购说明 */ @@ -72,4 +72,8 @@ 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/api/admin/entity/purchase/PurPlanEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java index 76c4c0d3..9758d010 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/PurPlanEntity.java @@ -38,7 +38,7 @@ public class PurPlanEntity { /** * 申购类型 */ - private Integer billType; + private String billType; /** * 申购说明 */ diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java index 790c0e2e..b312a1e3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupManufacturerEntity.java +++ b/api-admin/src/main/java/com/glxp/api/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/api/admin/entity/purchase/SupProductEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java index 08b15034..5731a104 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/purchase/SupProductEntity.java +++ b/api-admin/src/main/java/com/glxp/api/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/api/admin/req/purchase/FilterSupCertRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java index 0fd9afe2..9fe88684 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCertRequest.java @@ -13,4 +13,6 @@ 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/api/admin/req/purchase/FilterSupCompanyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java index 2a0deb07..30d8a152 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupCompanyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/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/api/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java index 42235069..02d256b4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/purchase/PurApplyRequest.java @@ -45,7 +45,7 @@ public class PurApplyRequest extends ListPageRequest { * 申购类型 */ @NotNull(message = "申购类型不能为空") - private Integer billType; + private String billType; /** * 申购说明 @@ -93,6 +93,8 @@ 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/api/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java index 55e6b905..4294ed92 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java @@ -30,6 +30,7 @@ public class FilterThrProductsRequest extends ListPageRequest { private Long id; private String uuid; + private Integer diType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java index d071e5a2..bc02c78b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java @@ -18,6 +18,6 @@ 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/api/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java index 1145cca6..b11ac78d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncDataResponse.java @@ -8,6 +8,10 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.entity.inventory.InvBusUserEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.api.admin.entity.purchase.SupCertEntity; +import com.glxp.api.admin.entity.purchase.SupCompanyEntity; +import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.api.admin.entity.purchase.SupProductEntity; import com.glxp.api.admin.entity.thrsys.*; import lombok.Data; @@ -46,4 +50,10 @@ public class SpsSyncDataResponse { //新增配送产品信息 List newUploadDiEntities; + //资质证书 + List supCompanyEntities; + List supManufacturerEntities; + List supProductEntities; + List supCertEntities; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java index ed9f1517..f3411268 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java @@ -37,4 +37,8 @@ public class SyncDataSetResponse { private Integer orderSyncDlTime; private Integer delaySyncTime; + private boolean unCheckCert; + private boolean checkedCert; + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java index 3781fb0b..7ed9c473 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurApplyResponse.java @@ -27,7 +27,7 @@ public class PurApplyResponse { /** * 申购类型 */ - private Long billType; + private String billType; /** * 申购说明 */ diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java index 3715ac09..2d9467b6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/purchase/PurPlanResponse.java +++ b/api-admin/src/main/java/com/glxp/api/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/api/admin/service/purchase/SupProductService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java index ad175fee..ae0bc4fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupProductService.java +++ b/api-admin/src/main/java/com/glxp/api/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/api/admin/service/purchase/impl/SupProductServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java index c5827d00..ccb7055a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/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/resources/mybatis/mapper/info/SyncDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml index 82eb4608..97044b3a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml @@ -11,12 +11,13 @@ - + replace INTO sync_data_set(id,typeBus, typeScan, typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv - , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, syncDownloadTime, - orderUnReceive,orderUnCheck,busTypes,syncIp,sysUser,entrustAction,orderSyncTime,orderSyncDlTime) + , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, + orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction + ,unCheckCert,checkedCert) values ( #{id}, #{typeBus}, @@ -33,17 +34,17 @@ #{dbDiProducts}, #{downstreamEnable}, #{syncTime}, - #{syncDownloadTime}, #{orderUnReceive}, #{orderUnCheck}, #{busTypes}, - #{syncIp}, #{sysUser}, - #{entrustAction}, #{orderSyncTime}, - #{orderSyncDlTime} + #{orderSyncStart}, + #{basicSyncStart}, + #{entrustAction}, + #{unCheckCert}, + #{checkedCert} ) - \ No newline at end of file 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 320966d3..2031ed4f 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 b9c741d5..1573c477 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') ]]> + @@ -150,10 +153,10 @@ - INSERT INTO sup_company(companyName, bussinessStatus, creditNum, classes, area, - detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, - auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, - editStatus) + 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) 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 e9d6a7fc..bf80d9e2 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,7 +56,9 @@ and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 ) - + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + @@ -83,8 +85,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 +100,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 dbc95c1a..1c1044a3 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,54 @@ where recordProductName = #{recordProductName} + + +