From ba3c9437bd99374a41e8af86ce3fc2203317c389 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 7 Nov 2022 10:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E8=90=A5=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/RegisterController.java | 22 +++++--- .../info/ClassifyCodeController.java | 34 ++++++++++++ .../inout/StockOrderDetailController.java | 20 +++++++ .../inventory/InvPreInProductsController.java | 6 +- .../purechase/SupCertController.java | 39 ++++++++++++- .../purechase/SupCertSetController.java | 6 ++ .../purechase/SupProductController.java | 34 ++---------- .../sale/admin/dao/info/ClassifyCodeDao.java | 13 +++++ .../admin/entity/info/ClassifyCodeEntity.java | 14 +++++ .../entity/purchase/SupCertSetEntity.java | 11 ++++ .../req/info/FilterClassifyCodeRequest.java | 18 ++++++ .../admin/req/inout/StockOrderIdsRequest.java | 1 + .../inventory/FilterInvProductRequest.java | 1 + .../req/purchase/PostSupCertRequest.java | 11 ++++ .../service/info/ClassifyCodeService.java | 14 +++++ .../info/impl/ClassifyCodeServiceImpl.java | 55 +++++++++++++++++++ .../service/purchase/SupProductService.java | 2 + .../purchase/impl/SupProductServiceImpl.java | 15 +++++ .../mybatis/mapper/info/ClassifyCodeDao.xml | 33 +++++++++++ .../mapper/inventory/InvPreInProductDao.xml | 7 +++ scripts/vue-admin-zz.sql | 10 ++-- 21 files changed, 317 insertions(+), 49 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/dao/info/ClassifyCodeDao.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/info/ClassifyCodeEntity.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterClassifyCodeRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSupCertRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/info/ClassifyCodeService.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ClassifyCodeServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/info/ClassifyCodeDao.xml diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index 680085a..a45764c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -326,7 +326,7 @@ public class RegisterController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Long customerId=0L; + Long customerId = 0L; UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId()); //判断是否选择供应商 if (StrUtil.isBlank(registerCheckRequest.getCompanyId()) && StrUtil.isBlank(registerCheckRequest.getCompanyName())) { @@ -341,20 +341,24 @@ public class RegisterController { basicUnitMaintainEntity1.setErpId(generateUserId() + ""); basicUnitMaintainEntity1.setCorpType(2); basicUnitMaintainEntity1.setOutType(0); + basicUnitMaintainEntity1.setCreditNo(userRegisterEntity.getCreditNum()); + basicUnitMaintainEntity1.setAddr(userRegisterEntity.getArea() + userRegisterEntity.getDetailAddr()); + basicUnitMaintainEntity1.setContact(userRegisterEntity.getRealName()); + basicUnitMaintainEntity1.setMobile(userRegisterEntity.getMobile()); basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity1); - customerId=Long.parseLong(basicUnitMaintainEntity1.getErpId()); + customerId = Long.parseLong(basicUnitMaintainEntity1.getErpId()); registerCheckRequest.setCompanyId(basicUnitMaintainEntity1.getErpId()); registerCheckRequest.setCompanyName(basicUnitMaintainEntity1.getName()); } - }else { - customerId=Long.parseLong(basicUnitMaintainEntity.getErpId()); - registerCheckRequest.setCompanyId(basicUnitMaintainEntity.getErpId()); - registerCheckRequest.setCompanyName(basicUnitMaintainEntity.getName()); + } else { + customerId = Long.parseLong(basicUnitMaintainEntity.getErpId()); + registerCheckRequest.setCompanyId(basicUnitMaintainEntity.getErpId()); + registerCheckRequest.setCompanyName(basicUnitMaintainEntity.getName()); } - }else { - customerId=Long.parseLong(registerCheckRequest.getCompanyId()); + } else { + customerId = Long.parseLong(registerCheckRequest.getCompanyId()); } - if(registerCheckRequest.getCheckType()==1){ + if (registerCheckRequest.getCheckType() == 1) { //通过就更新用户id 供应商用户 供应商id userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId()); userRegisterEntity.setCompanyName(registerCheckRequest.getCompanyName()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java new file mode 100644 index 0000000..15ec53b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/ClassifyCodeController.java @@ -0,0 +1,34 @@ +package com.glxp.sale.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.entity.info.ClassifyCodeEntity; +import com.glxp.sale.admin.req.info.FilterClassifyCodeRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.info.ClassifyCodeService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class ClassifyCodeController { + + @Resource + ClassifyCodeService classifyCodeService; + + @GetMapping("spms/classify/code/filter") + public BaseResponse filterList(FilterClassifyCodeRequest filterDeviceKeyRequest) { + List classifyCodeEntities = classifyCodeService.filteClassifyCode(filterDeviceKeyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(classifyCodeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(classifyCodeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + +} 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 d40e33d..4285c17 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 @@ -26,6 +26,7 @@ import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse; import com.glxp.sale.admin.res.inout.StockOrderDetailResponse; +import com.glxp.sale.admin.res.purchase.SupProductResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; @@ -36,6 +37,7 @@ import com.glxp.sale.admin.service.inout.StockOrderDetailService; import com.glxp.sale.admin.service.inout.StockOrderDetailTempService; import com.glxp.sale.admin.service.inout.StockOrderService; import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.purchase.SupProductService; import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.common.enums.ResultEnum; @@ -79,6 +81,8 @@ public class StockOrderDetailController { BussinessLocalTypeService bussinessLocalTypeService; @Resource CodesService codesService; + @Resource + SupProductService supProductService; @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter") @@ -287,6 +291,7 @@ public class StockOrderDetailController { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/stock/order/detail/getInstrumentById") public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { @@ -359,6 +364,21 @@ public class StockOrderDetailController { if (stockOrderDetailEntityList.size() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); } + + String value = systemParamConfigService.selectValueByParamKey("checkCert"); + if (StrUtil.isNotEmpty(value) && value.equals("1")) { + //判断证书是否齐全 + if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh())) { + SupProductResponse supProductResponse = supProductService.findByPassByReCert(stockOrderIdsRequest.getZczbhhzbapzbh()); + if (supProductResponse == null) { + return ResultVOUtils.error(601, "该产品所对应的资质证书未通过审核,无法配送，请先维护产品资质信息"); + } + } else { + return ResultVOUtils.error(500, "注册证不能为空！"); + } + } + + return ResultVOUtils.success(stockOrderDetailEntityList); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java index 8300cac..6891f95 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java @@ -105,9 +105,9 @@ public class InvPreInProductsController { if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) { filterInvProductRequest.setCustomerId(null); } - if (StrUtil.isEmpty(filterInvProductRequest.getBatchNo())) { - filterInvProductRequest.setBatchNo("empty"); - } +// if (StrUtil.isEmpty(filterInvProductRequest.getBatchNo())) { +// filterInvProductRequest.setBatchNo("empty"); +// } filterInvProductRequest.setInvStorageCode(null); filterInvProductRequest.setInvWarehouseCode(null); List invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest); 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 8dac207..1b60d64 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 @@ -6,18 +6,23 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.purchase.SupCertEntity; -import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.entity.purchase.*; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; import com.glxp.sale.admin.req.purchase.PostSelCertRequest; +import com.glxp.sale.admin.req.purchase.PostSupCertRequest; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.purchase.SupProductResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; 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.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -122,10 +127,38 @@ public class SupCertController { return ResultVOUtils.success("成功"); } + @Resource + SupCompanyService supCompanyService; + @Resource + SupManufacturerService supManufacturerService; + @Resource + SupProductService supProductService; + @AuthRuleAnnotation("") @PostMapping("/sup/info/updateCompanyCert") - public BaseResponse updateCompanyCert(@RequestBody SupCertEntity supCertEntity) { + public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { + SupCertEntity supCertEntity = new SupCertEntity(); + BeanUtils.copyProperties(postSupCertRequest, supCertEntity); + if (postSupCertRequest.getRepeatUpload() == 1) { + //已审核的重新提交 + //1.修改对应的资质信息进入变更审核状态， + if (postSupCertRequest.getType() == ConstantStatus.CERT_COMPANY) { + SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supCertEntity.getCustomerId()); + supCompanyEntity.setAuditStatus(ConstantStatus.AUDIT_CHANGE); + supCompanyService.modifyCompany(supCompanyEntity); + } else if (postSupCertRequest.getType() == ConstantStatus.CERT_MANUFACTURER) { + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supCertEntity.getManufacturerIdFk()); + supManufacturerEntity.setAuditStatus(ConstantStatus.AUDIT_CHANGE); + 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.setAuditStatus(ConstantStatus.AUDIT_CHANGE); + supProductService.modifyRegistration(supProductEntity); + } + } boolean b = supCertService.updateCompanyCert(supCertEntity); return ResultVOUtils.success("修改成功"); } 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 549dbc8..6bb4eda 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 @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.purechase; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.purchase.SupCertEntity; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @RestController public class SupCertSetController { @@ -62,6 +64,10 @@ public class SupCertSetController { @PostMapping("/sup/cert/set/update") public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { + if (CollUtil.isNotEmpty(supCertSetEntity.getFlbmList())) { + String flbm = supCertSetEntity.getFlbmList().stream().collect(Collectors.joining(",")); + supCertSetEntity.setFlbm(flbm); + } boolean b = supCertSetService.updateCertSet(supCertSetEntity); return ResultVOUtils.success("修改成功"); } 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 8e252af..26e61fa 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 @@ -174,25 +174,12 @@ public class SupProductController { while (iterable.hasNext()) { SupCertSetEntity supCertSetEntity = iterable.next(); - if (supCertSetEntity.isNeed() - || - (!supCertSetEntity.isNeed() && - supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 - && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进") - ) - || - (!supCertSetEntity.isNeed() && - supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 - && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进") - ) - || - (!supCertSetEntity.isNeed() && - !StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()) - ) - || - (!supCertSetEntity.isNeed() && - !StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()) - ) + if ((supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2 + && StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) + || (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")) + || (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())) + || (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb())) + || (supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode()))) ) { for (SupCertEntity supCertEntity : supCertEntityList) { if (supCertEntity.getName().equals(supCertSetEntity.getName())) { @@ -205,8 +192,6 @@ public class SupProductController { } else { iterable.remove(); } - - } String errMsg = ""; if (supCertSetEntities.size() > 0) { @@ -215,7 +200,6 @@ public class SupProductController { } return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } - } supProductEntity.setUpdate_date(new Date()); SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId()); @@ -238,7 +222,6 @@ public class SupProductController { return ResultVOUtils.error(500, "参数错误！"); } - // 查询是否包含审核未通过的证书 if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { @@ -250,18 +233,13 @@ public class SupProductController { filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { - - for (SupCertEntity supCertEntity : supCertEntityList) { supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); supCertService.updateCompanyCert(supCertEntity); } - // return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); } } - - supProductEntity.setUpdate_date(new Date()); boolean b = supProductService.modifyRegistration(supProductEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ClassifyCodeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ClassifyCodeDao.java new file mode 100644 index 0000000..47d2fdf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/ClassifyCodeDao.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.dao.info; + +import com.glxp.sale.admin.entity.info.ClassifyCodeEntity; +import com.glxp.sale.admin.req.info.FilterClassifyCodeRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ClassifyCodeDao { + + List filteClassifyCode(FilterClassifyCodeRequest filterClassifyCodeRequest); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ClassifyCodeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ClassifyCodeEntity.java new file mode 100644 index 0000000..03e16dd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/ClassifyCodeEntity.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.entity.info; + +import lombok.Data; + +@Data +public class ClassifyCodeEntity { + + private Integer id; + private String code; + private String name; + private String level; + private String qxlb; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java index ecf7404..05bd557 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java @@ -1,8 +1,11 @@ package com.glxp.sale.admin.entity.purchase; +import cn.hutool.core.util.StrUtil; import lombok.Data; +import java.util.Arrays; import java.util.Date; +import java.util.List; @Data public class SupCertSetEntity { @@ -19,6 +22,14 @@ public class SupCertSetEntity { private Date updateTime; private Integer type; + private List flbmList; + private boolean isPass; + public List getFlbmList() { + if (StrUtil.isNotEmpty(flbm)) { + return Arrays.asList(flbm.split(",")); + } + return flbmList; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterClassifyCodeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterClassifyCodeRequest.java new file mode 100644 index 0000000..3404afd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/FilterClassifyCodeRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.info; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterClassifyCodeRequest extends ListPageRequest { + + private String key; + private String code; + private String name; + + + private String inFilter; + private List inFilterList; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java index 2b4e583..24c053d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java @@ -15,4 +15,5 @@ public class StockOrderIdsRequest { boolean filterUDIType; UdiEntity udiEntity; List stockOrderLists; + private String zczbhhzbapzbh; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java index bcb933f..94894ab 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductRequest.java @@ -37,4 +37,5 @@ public class FilterInvProductRequest extends ListPageRequest { private List invCodes; private String udiCode; + private String orderIdFk; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSupCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSupCertRequest.java new file mode 100644 index 0000000..5d8c509 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSupCertRequest.java @@ -0,0 +1,11 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import lombok.Data; + +@Data +public class PostSupCertRequest extends SupCertEntity { + + + private int repeatUpload; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/ClassifyCodeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/ClassifyCodeService.java new file mode 100644 index 0000000..627b361 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/ClassifyCodeService.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.service.info; + +import com.glxp.sale.admin.entity.info.ClassifyCodeEntity; +import com.glxp.sale.admin.req.info.FilterClassifyCodeRequest; + +import java.util.List; + +public interface ClassifyCodeService { + + List filteClassifyCode(FilterClassifyCodeRequest filterClassifyCodeRequest); + + ClassifyCodeEntity findByCode(String code); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ClassifyCodeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ClassifyCodeServiceImpl.java new file mode 100644 index 0000000..b9b4c87 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/ClassifyCodeServiceImpl.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.service.info.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.info.ClassifyCodeDao; +import com.glxp.sale.admin.entity.info.ClassifyCodeEntity; +import com.glxp.sale.admin.req.info.FilterClassifyCodeRequest; +import com.glxp.sale.admin.service.info.ClassifyCodeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +@Service +public class ClassifyCodeServiceImpl implements ClassifyCodeService { + + @Resource + ClassifyCodeDao classifyCodeDao; + + @Override + public List filteClassifyCode(FilterClassifyCodeRequest filterClassifyCodeRequest) { + + if (filterClassifyCodeRequest == null) { + return Collections.emptyList(); + } + if (filterClassifyCodeRequest.getPage() != null) { + int offset = (filterClassifyCodeRequest.getPage() - 1) * filterClassifyCodeRequest.getLimit(); + PageHelper.offsetPage(offset, filterClassifyCodeRequest.getLimit()); + } + + if (StrUtil.isNotEmpty(filterClassifyCodeRequest.getInFilter())) { + filterClassifyCodeRequest.setInFilterList(Arrays.asList(filterClassifyCodeRequest.getInFilter().split(","))); + } + + return classifyCodeDao.filteClassifyCode(filterClassifyCodeRequest); + } + + @Override + public ClassifyCodeEntity findByCode(String code) { + + if (StrUtil.isEmpty(code)) + return null; + FilterClassifyCodeRequest filterClassifyCodeRequest = new FilterClassifyCodeRequest(); + filterClassifyCodeRequest.setCode(code); + + List classifyCodeEntities = classifyCodeDao.filteClassifyCode(filterClassifyCodeRequest); + if (CollUtil.isNotEmpty(classifyCodeEntities)) { + return classifyCodeEntities.get(0); + } + return null; + } +} 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 2ec2ffe..5899f47 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 @@ -13,6 +13,8 @@ public interface SupProductService { SupProductResponse findByProductId(String productId); + SupProductResponse findByPassByReCert(String registerCert); + SupProductResponse findJoinRegistration(Long id); SupProductEntity findRegistrationByName(String recordProductName); 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 0cfbaf4..9e5e08e 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 @@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.dao.purchase.SupProductDao; import com.glxp.sale.admin.entity.purchase.SupProductEntity; import com.glxp.sale.admin.req.purchase.FilterPoductRequest; @@ -39,6 +40,20 @@ public class SupProductServiceImpl implements SupProductService { return null; } + @Override + public SupProductResponse findByPassByReCert(String registerCert) { + if (StrUtil.isEmpty(registerCert)) + return null; + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + filterPoductRequest.setRecordCode(registerCert); + filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); + List supProductEntities = supProductDao.getRegistration(filterPoductRequest); + if (CollUtil.isNotEmpty(supProductEntities)) + return supProductEntities.get(0); + + return null; + } + @Override public SupProductResponse findJoinRegistration(Long id) { if (id == null) diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ClassifyCodeDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ClassifyCodeDao.xml new file mode 100644 index 0000000..01b73e6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/ClassifyCodeDao.xml @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml index 45d1557..c33717c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -50,6 +50,10 @@ AND invWarehouseCode = #{invWarehouseCode} + + AND orderIdFk = #{orderIdFk} + + AND invStorageCode IN @@ -179,6 +183,9 @@ AND unitFk = #{unitFk} + + AND orderIdFk = #{orderIdFk} + AND invStorageCode = #{invStorageCode} diff --git a/scripts/vue-admin-zz.sql b/scripts/vue-admin-zz.sql index 76f5b03..b6302cd 100644 --- a/scripts/vue-admin-zz.sql +++ b/scripts/vue-admin-zz.sql @@ -231,12 +231,8 @@ SET FOREIGN_KEY_CHECKS = 1; DROP INDEX `uniqueKey` ON inv_prein_product; -alter table inv_prein_product add UNIQUE uniqueKey(`orderIdFk`) -ALTER TABLE `thr_order` - ADD COLUMN `thirdPartyDate` tinyint(0) NULL DEFAULT NULL COMMENT '判断来源至哪里1：第三方 2：自己创建' AFTER `manufactory`; - ALTER TABLE `sup_cert` @@ -263,8 +259,10 @@ alter table io_order Add column preOutBillNo varchar(64) DEFAULT NULL COMMENT ' alter table inv_prein_product Add column orderIdFk varchar(64) DEFAULT NULL COMMENT '扫码单据外键'; -DROP INDEX `uniqueKey` ON inv_prein_product; -alter table inv_prein_product add UNIQUE uniqueKey(`orderIdFk`) ; + + +alter table sup_product Add column hchzsb VARCHAR(255) DEFAULT NULL COMMENT '耗材或者设备（产品类别）'; +# alter table inv_prein_product add UNIQUE uniqueKey(`orderIdFk`) ;