From 4c6dc5e4484c20c7875bd52aa936a402c20bb734 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 11 Nov 2022 16:27:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E8=90=A5=E8=B5=84=E8=B4=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98,=E8=B5=84=E8=B4=A8=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/SpsSyncDownloadController.java | 8 ++++---- .../admin/controller/basic/SpsSyncDownloadService.java | 1 - .../admin/controller/inout/StockOrderController.java | 4 +++- .../controller/purechase/SupCertSetController.java | 6 +++--- .../controller/purechase/SupContactController.java | 10 ++++++---- .../sale/admin/entity/param/SyncDataSetEntity.java | 3 +++ .../sale/admin/req/purchase/FilterPoductRequest.java | 1 + .../req/purchase/FilterSupManufacturerRequest.java | 1 + .../service/purchase/impl/SupCertServiceImpl.java | 7 +++++-- .../service/purchase/impl/SupCompanyServiceImpl.java | 7 +++++-- .../purchase/impl/SupManufacturerServiceImpl.java | 8 ++++++-- .../src/main/resources/application-dev.properties | 2 +- .../resources/mybatis/mapper/param/SyncDataSetDao.xml | 4 ++-- .../mybatis/mapper/purchase/SupManufacturerDao.xml | 2 +- 14 files changed, 41 insertions(+), 23 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 eeb4001..430e63d 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 @@ -80,11 +80,11 @@ public class SpsSyncDownloadController { 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"; + logs = logs + "生产企业资质证书：" + baseResponse.getData().getSupManufacturerEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getSupProductEntities())) + logs = logs + "产品资质证书：" + baseResponse.getData().getSupProductEntities().size() + "条\n"; if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities())) - logs = logs + "资质证书：" + baseResponse.getData().getSupCertEntities().size() + "条\n"; + 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 9ae67cc..ecce866 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 @@ -335,7 +335,6 @@ public class SpsSyncDownloadService { 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()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 10b15b8..c54cb28 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -733,7 +733,9 @@ public class StockOrderController { if (stockOrderDetailEntity.getRelId().equals(warehouseEntity.getRelId()) && StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(warehouseEntity.getBatchNo())) ) { - stockOrderDetailEntity.setAcceptCount(stockOrderDetailEntity.getAcceptCount() + warehouseEntity.getCount()); + stockOrderDetailEntity.setAcceptCount(stockOrderDetailEntity.getAcceptCount() + + udiInfoUtils.getActCount(warehouseEntity) + ); if (stockOrderDetailEntity.getAcceptCount() > Integer.parseInt(stockOrderDetailEntity.getReCount())) { return ResultVOUtils.error(500, "数量溢出！"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java index b0d1f9f..e2420a7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java @@ -37,7 +37,7 @@ public class SupCertSetController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - filterCertSetsRequest.setNeed(0); +// filterCertSetsRequest.setNeed(0); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); PageInfo pageInfo; @@ -57,8 +57,8 @@ public class SupCertSetController { } supCertSetEntity.setUpdateTime(new Date()); - if(supCertSetEntity.getType()==3){ - if(supCertSetEntity.getFlbmList().size()>0){ + if (supCertSetEntity.getType() == 3) { + if (supCertSetEntity.getFlbmList().size() > 0) { String flbm = String.join(",", supCertSetEntity.getFlbmList()); supCertSetEntity.setFlbm(flbm); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java index 21f13bf..ed7c408 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java @@ -12,6 +12,8 @@ import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -37,8 +39,8 @@ public class SupContactController { } @AuthRuleAnnotation("") - @GetMapping("salewarehouse/customerContact/add") - public BaseResponse addContact(CustomerContactEntity customerContactEntity) { + @PostMapping("salewarehouse/customerContact/add") + public BaseResponse addContact(@RequestBody CustomerContactEntity customerContactEntity) { boolean b = customerContactService.insertCustomerContact(customerContactEntity); if (b) @@ -50,8 +52,8 @@ public class SupContactController { } @AuthRuleAnnotation("") - @GetMapping("salewarehouse/customerContact/delete") - public BaseResponse deleteContact(DeleteRequest deleteRequest) { + @PostMapping("salewarehouse/customerContact/delete") + public BaseResponse deleteContact(@RequestBody DeleteRequest deleteRequest) { boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); if (b) return ResultVOUtils.success("删除成功"); 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 a8efd2a..e8a5804 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 @@ -35,5 +35,8 @@ public class SyncDataSetEntity { private boolean unCheckCert; private boolean checkedCert; + private boolean companyCert; + private boolean manufacturerCert; + private boolean productCert; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java index 3c8432e..79e59bd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java @@ -17,4 +17,5 @@ public class FilterPoductRequest extends ListPageRequest { private String manufacturerIdFk; private String customerId; private Integer auditStatus; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java index 1c10762..8289659 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java @@ -13,4 +13,5 @@ public class FilterSupManufacturerRequest extends ListPageRequest { private String customerId; private Integer auditStatus; private String manufacturerId; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java index b506619..99a85d2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java @@ -37,8 +37,11 @@ public class SupCertServiceImpl implements SupCertService { if (filterSupCertRequest == null) { return Collections.emptyList(); } - int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); - PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + if (filterSupCertRequest.getPage() != null) { + int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + } + List companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); return companyEntities; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java index 93aecc6..1a2b8d3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java @@ -43,8 +43,11 @@ public class SupCompanyServiceImpl implements SupCompanyService { if (commitRequest == null) { return Collections.emptyList(); } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); + if (commitRequest.getPage() != null) { + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + } + List companyEntities = supCompanyDao.getSubCompany(commitRequest); return companyEntities; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java index 9cf8d86..c7b37c3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java @@ -49,8 +49,12 @@ public class SupManufacturerServiceImpl implements SupManufacturerService { if (filterSupManufacturerRequest == null) { return Collections.emptyList(); } - int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit(); - PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit()); + + if(filterSupManufacturerRequest.getPage()!=null){ + int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit()); + } + List companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); return companyEntities; } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index d3db546..62b651c 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://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +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.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 236dc8e..5d5a978 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/param/SyncDataSetDao.xml @@ -17,7 +17,7 @@ typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction - ,unCheckCert,checkedCert) + ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert) values ( #{id}, #{typeBus}, @@ -43,7 +43,7 @@ #{basicSyncStart}, #{entrustAction}, #{unCheckCert}, - #{checkedCert} + #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert} ) 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 7eaa434..a92423f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -57,7 +57,7 @@ and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 ) - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>