From 689afac66be3f9a0cf57c2ca374cfb41e8166713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 26 Dec 2022 11:27:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 6 ++- .../purechase/SupCompanyController.java | 45 ++++++++++++++++++- .../admin/entity/inout/StockOrderEntity.java | 2 +- .../req/inout/StockOrderPostRequest.java | 1 + .../admin/res/basic/UdiRelevanceResponse.java | 1 + .../mybatis/mapper/inout/StockOrderDao.xml | 5 ++- .../mapper/purchase/PurApplyDetailDao.xml | 1 + .../main/resources/schemas/schema_v2.1.sql | 1 + 8 files changed, 57 insertions(+), 5 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 52bd86e..8c5c6fa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -283,7 +283,10 @@ public class UdiRelevanceController { return ResultVOUtils.error(500, vailResult); } - + //判断父id不为空就吧值给到id里面防止id变成详情id + if(udiRelevanceResponse.getPid()!=null){ + udiRelevanceResponse.setId(udiRelevanceResponse.getPid()); + } UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); @@ -317,6 +320,7 @@ public class UdiRelevanceController { udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); + udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl()); udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java index edf0b02..dc3034d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java @@ -59,6 +59,8 @@ public class SupCompanyController { private SupCertService supCertService; @Resource BasicUnitMaintainService basicUnitMaintainService; + @Resource + SupCompanyService supCompanyService; @AuthRuleAnnotation("") @@ -77,6 +79,47 @@ public class SupCompanyController { @PostMapping("/api/pur/addCompany") public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { + //判断是不是存在草稿 + if(companyEntity.getAuditStatus()==6){ + List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); for(SupCertEntity obj:supCertEntityList){ + if(obj.getAuditStatus()==0){ + return ResultVOUtils.error(999,"证书中存在草稿不允许提交！"); + } + } + + //提交审核 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + filterCertSetsRequest.setNeed(1); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + + //验证 + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + if (supCertSetEntity.isNeed()) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + + } + String customerId = CustomUtil.getId(); //重新生成customerId CustomerContactEntity customerContactEntity = new CustomerContactEntity(); customerContactEntity.setTel(companyEntity.getTel()); @@ -234,7 +277,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("api/pur/supCompany/delete") public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { - boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + boolean b = supCompanyService.deleteCompany(Long.parseLong(deleteRequest.getId())); if (b) return ResultVOUtils.success("删除成功"); else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index 9ceb230..54ae297 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java @@ -51,7 +51,7 @@ public class StockOrderEntity { private String dept; private String deptName; private String remark; - + private Boolean noInvOut; private String reviewUserName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java index 9375a06..09662a5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java @@ -31,5 +31,6 @@ public class StockOrderPostRequest { private String fromSubInvCode; private Integer thirdPartyDate; private List subErpOrders; + private Boolean noInvOut; private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 0246d6f..812fffe 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -87,6 +87,7 @@ public class UdiRelevanceResponse { private String basicPrductRemak8; private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 + private Integer pid; //用来存父id //产品代理商 private String cpdls; diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 5921084..2f7f44b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -30,7 +30,7 @@ thirdSysFk, status, statusInfo, `type`, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, - updateTime, invWarehouseCode, fromSubInvCode, dept) + updateTime, invWarehouseCode, fromSubInvCode, dept ,noInvOut) values (#{id}, #{billNo}, #{billdate}, @@ -45,7 +45,7 @@ #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime}, - #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept}) + #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept},#{noInvOut}) UPDATE stock_order @@ -77,6 +77,7 @@ invWarehouseCode=#{invWarehouseCode}, fromSubInvCode=#{fromSubInvCode}, dept=#{dept}, + noInvOut=#{noInvOut}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index de9f85d..1d6c00f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -40,6 +40,7 @@ AND supId = #{supId} + GROUP BY productId diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 21e097e..c65ba87 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -3,6 +3,7 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1); INSERT ignore INTO scheduled(id, cronName, cron, customerId, remark)