From ebf625ec092aa71b3cf81b1c897b01a8f5b689e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 28 Mar 2023 15:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertController.java | 31 +++++++++++++++++ .../api/entity/purchase/SupCompanyEntity.java | 9 +++++ .../purchase/SupManufacturerEntity.java | 4 +++ .../api/entity/purchase/SupProductEntity.java | 33 +++++++++++++++++++ .../api/req/purchase/FilterPoductRequest.java | 2 +- .../req/purchase/FilterSupCompanyRequest.java | 1 + .../FilterSupManufacturerRequest.java | 1 + .../mybatis/mapper/purchase/SupCompanyDao.xml | 10 +++++- .../mapper/purchase/SupManufacturerDao.xml | 7 +++- .../mybatis/mapper/purchase/SupProductDao.xml | 20 ++++++++--- 10 files changed, 111 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 5db99af15..5b662468d 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -460,4 +460,35 @@ public class SupCertController { JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); } + + //撤回单据 + @AuthRuleAnnotation("") + @PostMapping("/sale/sup/cert/revoke") + public BaseResponse revokeSupCert(@RequestBody SupCertEntity supCertEntity) { + supCertEntity.setCreateTime(new Date()); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.updateCompanyCert(supCertEntity); + if (supCertEntity.getType() == ConstantStatus.CERT_COMPANY) { + SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supCertEntity.getCustomerId()); + supCompanyEntity.setAuditStatus(ConstantStatus.AUDIT_UN); + supCompanyEntity.setUpdateTime(new Date()); + supCompanyService.modifyCompany(supCompanyEntity); + } else if (supCertEntity.getType() == ConstantStatus.CERT_MANUFACTURER) { + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supCertEntity.getManufacturerIdFk()); + supManufacturerEntity.setAuditStatus(ConstantStatus.AUDIT_UN); + supManufacturerEntity.setUpdateTime(new Date()); + supManufacturerService.modifyCompany(supManufacturerEntity); + } else if (supCertEntity.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_UN); + supProductService.modifyRegistration(supProductEntity); + } + + + return ResultVOUtils.success("成功"); + } + } diff --git a/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java index a10414361..4690a5650 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java @@ -302,5 +302,14 @@ public class SupCompanyEntity { @TableField(exist = false) private String auditor; + @TableField(exist = false) + private String failCout; + @TableField(exist = false) + private String passCout; + @TableField(exist = false) + private String productFailCout; + @TableField(exist = false) + private String prouctPassCout; + } diff --git a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java index b1fa23a7a..04511a341 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java @@ -195,5 +195,9 @@ public class SupManufacturerEntity{ @TableField(exist = false) private String supName; + @TableField(exist = false) + private String failCout; + @TableField(exist = false) + private String passCout; } diff --git a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java index 7668b7c16..16fa287bd 100644 --- a/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java @@ -254,4 +254,37 @@ public class SupProductEntity{ @TableField("updateTime") private Date updateTime; + @TableField(value = "manufactory") + private String manufactory; + + /** + * 往来单位ID + */ + @TableField(exist = false) + private String companyName; + + /** + * 是否允许无批次号扫码 + */ + @TableField(value = "allowNoBatch") + private Boolean allowNoBatch; + + /** + * 是否允许无生产日期扫码 + */ + @TableField(value = "allowNoExpire") + private Boolean allowNoExpire; + + /** + * 是否允许无失效日期扫码 + */ + @TableField(value = "allowNoProduct") + private Boolean allowNoProduct; + + /** + * 是否允许无序列号 + */ + @TableField(value = "allowNoSerial") + private Boolean allowNoSerial; + } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java index 3101ac03b..bffdef85a 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java @@ -12,7 +12,7 @@ public class FilterPoductRequest extends ListPageRequest { private String recordCode; private String recordProductName; private String recordPeopleName; - + private String manufactory; private String productId; private String manufacturerIdFk; diff --git a/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java index 82ebcb91c..4200295fb 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupCompanyRequest.java @@ -16,4 +16,5 @@ public class FilterSupCompanyRequest extends ListPageRequest { private String unitIdFk; private String lastUpdateTime; private List auditStatusList; + private Integer manufacturerStatus; } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java index 5d3cbc7ac..ce807ccf5 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterSupManufacturerRequest.java @@ -16,4 +16,5 @@ public class FilterSupManufacturerRequest extends ListPageRequest { private String manufacturerId; private Integer type; private String lastUpdateTime; + private Integer productStatus; } diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index 193da8dc2..093b93fe8 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -14,7 +14,15 @@ - SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer + SELECT sup_manufacturer.* ,sup_company.companyName as supName + + ,(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as failCout, + (SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as passCout + + FROM sup_manufacturer inner join sup_company on sup_manufacturer.customerId = sup_company.customerId diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index 38f24a87c..c32ac8ba7 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -48,6 +48,9 @@ and sup_product.auditStatus = #{auditStatus} + + and sup_product.manufactory = #{manufactory} + and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or sup_product.auditStatus=2) @@ -111,7 +114,9 @@ and 0 ]]> - + + and sup_product.manufactory = #{manufactory} + and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 ) @@ -162,7 +167,11 @@ cpms=#{cpms}, hchzsb=#{hchzsb}, relIdFk=#{relIdFk}, - + manufactory=#{manufactory}, + allowNoBatch=#{allowNoBatch}, + allowNoExpire=#{allowNoExpire}, + allowNoProduct=#{allowNoProduct}, + allowNoSerial=#{allowNoSerial}, WHERE id=#{id} @@ -181,7 +190,8 @@ specification, structure, `scope`, other, filePath, remark, createTime, updateTime, manufacturerIdFk, customerId, productId - , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb,relIdFk) + , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb,relIdFk,manufactory, allowNoBatch, + allowNoExpire, allowNoProduct, allowNoSerial) values ( #{enterpriseId}, #{recordCode}, @@ -222,7 +232,9 @@ #{measname}, #{cpms}, #{hchzsb}, - #{relIdFk} + #{relIdFk}, + #{manufactory}, #{allowNoBatch}, #{allowNoExpire}, #{allowNoProduct}, + #{allowNoSerial} )