diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index a0d8bd7..e23cdc7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java @@ -388,8 +388,8 @@ public class OrderDetailController { BeanUtils.copyProperties(erpOrderEntity, item); item.setCode(codeDetaiEntity.getCode()); item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService)); - item.setReCount(erpOrderEntity.getReCount()); - item.setErpCount(erpOrderEntity.getErpCount()); + item.setReCount(codeDetaiEntity.getCount()); + item.setErpCount(codeDetaiEntity.getCount()); item.setCodeId(codeDetaiEntity.getId().intValue()); item.setSerialNo(codeDetaiEntity.getSerialNo()); resultList.add(item); 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 a529801..8dac207 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 @@ -1,12 +1,17 @@ package com.glxp.sale.admin.controller.purechase; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; 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.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.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.purchase.SupCertService; @@ -45,6 +50,10 @@ public class SupCertController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + if (StrUtil.isEmpty(filterSupCertRequest.getCustomerId())) { + filterSupCertRequest.setCustomerId(getCustomerId()); + } List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); PageInfo pageInfo; @@ -78,6 +87,32 @@ public class SupCertController { } + @AuthRuleAnnotation("") + @PostMapping("/sup/info/selectAllCert") + public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) { + String customerId = getCustomerId(); + if (CollUtil.isEmpty(postSelCertRequest.getSupCertSetEntities())) { + return ResultVOUtils.error(500, "请选入资质证书！"); + } + if (postSelCertRequest.getCertType() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { + SupCertEntity supCertEntity = new SupCertEntity(); + supCertEntity.setName(supCertSetEntity.getName()); + supCertEntity.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertEntity.setProductIdFk(postSelCertRequest.getProductIdFk()); + supCertEntity.setCustomerId(customerId); + supCertEntity.setType(postSelCertRequest.getCertType()); + supCertEntity.setCreateTime(new Date()); + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + } + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") @PostMapping("/sale/sup/cert/audit") public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) { 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 new file mode 100644 index 0000000..549dbc8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java @@ -0,0 +1,77 @@ +package com.glxp.sale.admin.controller.purechase; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.req.inout.DeleteRequest; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.purchase.SupCertSetService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +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; +import java.util.Date; +import java.util.List; + +@RestController +public class SupCertSetController { + + @Resource + private SupCertSetService supCertSetService; + + + @AuthRuleAnnotation("") + @GetMapping("/sup/cert/set/filter") + public BaseResponse filterCertSet(FilterCertSetsRequest filterCertSetsRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List supCertEntityList + = supCertSetService.filterCertSets(filterCertSetsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/add") + public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { + if (supCertSetEntity == null) { + supCertSetEntity = new SupCertSetEntity(); + } + supCertSetEntity.setUpdateTime(new Date()); + boolean b = supCertSetService.insertCertSet(supCertSetEntity); + return ResultVOUtils.success("添加成功！"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/update") + public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) { + + boolean b = supCertSetService.updateCertSet(supCertSetEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sup/cert/set/delete") + public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) { + + boolean b = supCertSetService.deleteById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功！"); + } +} 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 27b53fc..a961c7e 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 @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.purechase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; @@ -9,21 +10,25 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.auth.CustomerContactEntity; import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.entity.purchase.SupProductEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteRequest; -import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; -import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.sale.admin.req.purchase.*; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.impl.CustomerContactService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupCertSetService; import com.glxp.sale.admin.service.purchase.SupCompanyService; import com.glxp.sale.admin.util.CustomUtil; 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.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -36,6 +41,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.ListIterator; @RestController public class SupCompanyController { @@ -92,9 +98,46 @@ public class SupCompanyController { } + @Resource + SupCertSetService supCertSetService; + + @AuthRuleAnnotation("") @PostMapping("/api/pur/modifyCompany") public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { + + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //提交审核 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); + //验证 + 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) + "等证书未上传，无法提交审核！"); + } + } + + companyEntity.setUpdateTime(new Date()); boolean b = companyService.modifyCompany(companyEntity); CustomerContactEntity customerContactEntity = new CustomerContactEntity(); @@ -122,9 +165,12 @@ public class SupCompanyController { filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { - return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); } - } @@ -157,6 +203,22 @@ public class SupCompanyController { } + @AuthRuleAnnotation("") + @PostMapping("/sup/company/selectBind") + public BaseResponse selectBind(@RequestBody SelectCorpBindRequest selectCorpBindRequest) { + + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(selectCorpBindRequest.getCustomerId()); + SupCompanyEntity supCompanyEntity = new SupCompanyEntity(); + supCompanyEntity.setCustomerId(basicUnitMaintainEntity.getErpId()); + supCompanyEntity.setCompanyName(basicUnitMaintainEntity.getName()); + supCompanyEntity.setCreditNum(basicUnitMaintainEntity.getCreditNo()); + supCompanyEntity.setContacts(basicUnitMaintainEntity.getContact()); + supCompanyEntity.setTel(basicUnitMaintainEntity.getMobile()); + + return ResultVOUtils.success(supCompanyEntity); + } + + @AuthRuleAnnotation("") @PostMapping("api/pur/supCompany/delete") public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java index 33b8b7b..ed7bca4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java @@ -7,15 +7,18 @@ 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.SupCompanyEntity; import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupCertSetService; import com.glxp.sale.admin.service.purchase.SupCompanyService; import com.glxp.sale.admin.service.purchase.SupManufacturerService; import com.glxp.sale.common.enums.ResultEnum; @@ -32,6 +35,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.ListIterator; @RestController public class SupManufacturerController { @@ -45,6 +49,8 @@ public class SupManufacturerController { private SupCertService supCertService; @Resource private SupCompanyService supCompanyService; + @Resource + SupCertSetService supCertSetService; @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/getCompanyInfo") @@ -67,9 +73,27 @@ public class SupManufacturerController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyBySup") + public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) { + filterSupManufacturerRequest.setCustomerId(getCustomerId()); + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @AuthRuleAnnotation("") @PostMapping("/sup/manufacturer/addCompany") public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { + + String customerId = getCustomerId(); + if (!customerId.equals("110")) { + supManufacturerEntity.setCustomerId(customerId); + } + supManufacturerEntity.setCreateDate(new Date()); supManufacturerEntity.setUpdateDate(new Date()); boolean b = supManufacturerService.insertCompany(supManufacturerEntity); @@ -95,10 +119,56 @@ public class SupManufacturerController { || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！"); } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + + if (supCertSetEntity.isNeed() + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + + || + (!supCertSetEntity.isNeed() + && supCertSetEntity.getForeign() != null + && supCertSetEntity.getForeign() == 1 + && supManufacturerEntity.getCompanyType().equals("1"))) { + for (SupCertEntity supCertEntity : supCertEntityList) { + + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } else { + iterable.remove(); + } + + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + } + supManufacturerEntity.setUpdateDate(new Date()); - SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId()); + SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId()); boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); //修改证书对应的供应商ID，生产企业ID supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId()); @@ -127,7 +197,11 @@ public class SupManufacturerController { filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER); List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { - return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); } } 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 946496c..8e252af 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 @@ -10,14 +10,16 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.purchase.SupCertEntity; -import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.entity.purchase.*; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; import com.glxp.sale.admin.req.purchase.FilterPoductRequest; import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.req.purchase.SelectProductBindRequest; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.purchase.SupProductResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.BasicThirdSysService; @@ -25,6 +27,8 @@ import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupCertSetService; +import com.glxp.sale.admin.service.purchase.SupManufacturerService; import com.glxp.sale.admin.service.purchase.SupProductService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.util.CustomUtil; @@ -34,6 +38,7 @@ import com.glxp.sale.admin.util.UdiInfoUtil; 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.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -45,6 +50,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.List; +import java.util.ListIterator; @RestController public class SupProductController { @@ -101,6 +107,46 @@ public class SupProductController { } } + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/selectBind") + public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { + + + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(selectProductBindRequest.getRelIdFk()); + + SupProductEntity supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(selectProductBindRequest.getRelIdFk()); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreate_date(new Date()); + supProductEntity.setUpdate_date(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); + + return ResultVOUtils.success(supProductEntity); +// boolean b = supProductService.insertRegistration(supProductEntity); +// if (b) { +// return ResultVOUtils.success(supProductEntity); +// } else { +// return ResultVOUtils.error(ResultEnum.NOT_NETWORK); +// } + } + + + @Resource + SupManufacturerService supManufacturerService; + @Resource + SupCertSetService supCertSetService; + @AuthRuleAnnotation("") @PostMapping("/sup/product/modifyRegistration") public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) { @@ -108,8 +154,71 @@ public class SupProductController { if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) { return ResultVOUtils.error(500, "参数错误！"); } + + //提交审核 + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属生产企业资质未通过审核，暂时无法提交！"); + } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + ListIterator iterable = supCertSetEntities.listIterator(); + 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()) + ) + ) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } else { + iterable.remove(); + } + + + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + } supProductEntity.setUpdate_date(new Date()); - SupProductEntity originEntity = supProductService.findRegistration(supProductEntity.getId()); + SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId()); supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(), supProductEntity.getManufacturerIdFk(), originEntity.getProductId(), supProductEntity.getProductId()); boolean b = supProductService.modifyRegistration(supProductEntity); @@ -141,7 +250,14 @@ public class SupProductController { filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); if (CollUtil.isNotEmpty(supCertEntityList)) { - return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + + + for (SupCertEntity supCertEntity : supCertEntityList) { + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS); + supCertService.updateCompanyCert(supCertEntity); + } + +// return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); } } @@ -149,73 +265,73 @@ public class SupProductController { supProductEntity.setUpdate_date(new Date()); boolean b = supProductService.modifyRegistration(supProductEntity); - if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) { - SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId()); - - //步骤1：先添加到主系统第三方产品信息； - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - thrProductsEntity.setCode(gennerOrderUtils.getRelId() + ""); - thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId()); - thrProductsEntity.setName(supProductEntity.getRecordProductName()); - thrProductsEntity.setSpec(supProductEntity.getSpecification()); - thrProductsEntity.setStandard(supProductEntity.getSpecification()); - thrProductsEntity.setManufactory(supProductResponse.getManufacturerName()); - thrProductsService.insertThrProducts(thrProductsEntity); - - - //步骤2：添加到关联表 - String uuid = CustomUtil.getUUId(); - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); - udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); - udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); - udiRelevanceEntity.setMainName(thrProductsEntity.getName()); - udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); - String time = DateUtil.getDateTime(); - udiRelevanceEntity.setUpdateTime(time); - udiRelevanceEntity.setModifyTime(time); - udiRelevanceEntity.setUuid(uuid); - udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName()); - udiRelevanceEntity.setSupName(supProductResponse.getSupName()); - udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - - - //步骤3：添加基础信息表 - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(thrProductsEntity.getCode()); - udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); - udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); - udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName()); - udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); - udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode()); - udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); - udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); - udiInfoEntity.setDiType(1); - udiInfoEntity.setScbssfbhph("是"); - udiInfoEntity.setScbssfbhscrq("是"); - udiInfoEntity.setScbssfbhsxrq("是"); - udiInfoEntity.setScbssfbhxlh("否"); - udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); - udiInfoService.insertUdiInfo(udiInfoEntity); - - - //步骤4：添加供应商关联表 - CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); - companyProductRelevanceEntity.setCreate_time(new Date()); - companyProductRelevanceEntity.setUpdate_time(new Date()); - companyProductRelevanceEntity.setAuditStatus("3"); - companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId()); - companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); - companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId()); - companyProductRelevanceEntity.setProductId(supProductEntity.getProductId()); - companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId()); - companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk()); - companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); - - - } +// if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) { +// SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId()); +// +// //步骤1：先添加到主系统第三方产品信息； +// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); +// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); +// thrProductsEntity.setCode(gennerOrderUtils.getRelId() + ""); +// thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId()); +// thrProductsEntity.setName(supProductEntity.getRecordProductName()); +// thrProductsEntity.setSpec(supProductEntity.getSpecification()); +// thrProductsEntity.setStandard(supProductEntity.getSpecification()); +// thrProductsEntity.setManufactory(supProductResponse.getManufacturerName()); +// thrProductsService.insertThrProducts(thrProductsEntity); +// +// +// //步骤2：添加到关联表 +// String uuid = CustomUtil.getUUId(); +// UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); +// udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); +// udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); +// udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); +// udiRelevanceEntity.setMainName(thrProductsEntity.getName()); +// udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); +// String time = DateUtil.getDateTime(); +// udiRelevanceEntity.setUpdateTime(time); +// udiRelevanceEntity.setModifyTime(time); +// udiRelevanceEntity.setUuid(uuid); +// udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName()); +// udiRelevanceEntity.setSupName(supProductResponse.getSupName()); +// udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); +// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); +// +// +// //步骤3：添加基础信息表 +// UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); +// udiInfoEntity.setNameCode(thrProductsEntity.getCode()); +// udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); +// udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); +// udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName()); +// udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); +// udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode()); +// udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); +// udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); +// udiInfoEntity.setDiType(1); +// udiInfoEntity.setScbssfbhph("是"); +// udiInfoEntity.setScbssfbhscrq("是"); +// udiInfoEntity.setScbssfbhsxrq("是"); +// udiInfoEntity.setScbssfbhxlh("否"); +// udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); +// udiInfoService.insertUdiInfo(udiInfoEntity); +// +// +// //步骤4：添加供应商关联表 +// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); +// companyProductRelevanceEntity.setCreate_time(new Date()); +// companyProductRelevanceEntity.setUpdate_time(new Date()); +// companyProductRelevanceEntity.setAuditStatus("3"); +// companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId()); +// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); +// companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId()); +// companyProductRelevanceEntity.setProductId(supProductEntity.getProductId()); +// companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId()); +// companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk()); +// companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); +// +// +// } if (b) { return ResultVOUtils.success("审核通过！"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java index b512a79..ec8e666 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvPreInProductDao.java @@ -30,4 +30,6 @@ public interface InvPreInProductDao { boolean deleteById(@Param("id") String id); boolean deleteAll(); + + boolean deleteByOrderIdFk(@Param("orderIdFk") String orderIdFk); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java new file mode 100644 index 0000000..c7e35c6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.dao.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SupCertSetDao { + List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); + + boolean insertCertSet(SupCertSetEntity supCertSetEntity); + + + boolean updateCertSet(SupCertSetEntity supCertSetEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index 3b8b2e8..141aeb4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -73,4 +73,7 @@ public class OrderEntity { */ private boolean codeFillCheck; + private String preInBillNo; + private String preOutBillNo; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java index 9cc8876..7d0361c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java @@ -26,6 +26,7 @@ public class InvProductEntity { private String invWarehouseCode; private String price; private Date updateTime; + private String orderIdFk; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java index 09bd6e6..7cbbced 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java @@ -28,5 +28,6 @@ public class SupCertEntity { private String productIdFk; private Integer auditStatus; //审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 private String auditComment; + private int status; //0：启用，1:禁用 } 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 new file mode 100644 index 0000000..ecf7404 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertSetEntity.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.entity.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SupCertSetEntity { + + private Integer id; + private String name; + private boolean need; + private Integer foreign; + private String cplx; + private String hchzsb; + private String flbm; + private Integer imports; + private String remark; + private Date updateTime; + private Integer type; + + private boolean isPass; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java index a217d72..5d1b9de 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java @@ -75,4 +75,6 @@ public class SupCompanyEntity { private String auditComment; private Integer editStatus; + private int status; //0：启用，1:禁用 + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java index 39cdc02..2d5b5a9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java @@ -54,5 +54,7 @@ public class SupProductEntity { private String ybbm; private String measname; private String cpms; + private String hchzsb; + private String relIdFk; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java new file mode 100644 index 0000000..f8bb028 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterCertSetsRequest extends ListPageRequest { + + private String name; + private Integer type; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSelCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSelCertRequest.java new file mode 100644 index 0000000..2a5be78 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PostSelCertRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostSelCertRequest { + + + private Integer certType; + private String manufacturerIdFk; + private String productIdFk; + private List supCertSetEntities; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectCorpBindRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectCorpBindRequest.java new file mode 100644 index 0000000..72e2434 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectCorpBindRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.purchase; + +import lombok.Data; + +@Data +public class SelectCorpBindRequest { + + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectProductBindRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectProductBindRequest.java new file mode 100644 index 0000000..0ae37b7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/SelectProductBindRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.purchase; + +import lombok.Data; + +@Data +public class SelectProductBindRequest { + + private String productId; + private String relIdFk; + private String manufacturerId; + private String customerId; + private Integer auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java index f0a230b..d290231 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/OrderNoResult.java @@ -21,4 +21,10 @@ public class OrderNoResult { //复制单号，多个单号之间使用英文逗号,分隔 private String replicateNo; + //验收出库关联的预验收入库单，多个单号,隔开 + private String preInBillNo; + + //预验收入库单关联的预验收出库单，多个单号,隔开 + private String preOutBillNo; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java index a03287a..c2617b8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java @@ -25,6 +25,7 @@ public class InvProductResponse { private String invStorageName; private String invSubStorageName; private String invWarehouseCode; + private String orderIdFk; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index f223245..2617177 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -93,6 +93,9 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { @Override public BasicUnitMaintainEntity selectByErpId(String id) { + if (id == null) { + return null; + } BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); filterUdiInfoRequest.setErpId(id); List basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java index 08f9bcf..3a6d398 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java @@ -30,4 +30,6 @@ public interface InvPreInProductDetailService { InvProductDetailEntity statInvPreInDetail(String code); + + boolean deleteByOrderIdFk(String orderIdFk); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java index 5696151..3f926d1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductService.java @@ -26,4 +26,6 @@ public interface InvPreInProductService { boolean deleteAll(); + boolean deleteByOrderIdFk(String orderIdFk); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java index 9c82adb..28dd490 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreProductService.java @@ -24,4 +24,6 @@ public interface InvPreProductService { boolean deleteById(String id); + + } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 984f97a..a5d5ac8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -125,8 +125,8 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe } else { bacthNo = invProductDetailEntity.getBatchNo(); } - InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode()); - invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); +// InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode()); +// invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount()); return invProductDetailEntity; } return null; @@ -154,4 +154,9 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe // } // } } + + @Override + public boolean deleteByOrderIdFk(String orderIdFk) { + return invPreInProductDetailDao.deleteByOrderId(orderIdFk); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java index 2e52b89..f5e3b6e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; + @Service public class InvPreInProductServiceImpl implements InvPreInProductService { @@ -82,5 +83,10 @@ public class InvPreInProductServiceImpl implements InvPreInProductService { return invPreInProductDao.deleteAll(); } + @Override + public boolean deleteByOrderIdFk(String orderIdFk) { + return invPreInProductDao.deleteByOrderIdFk(orderIdFk); + } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java index 6be5251..6071176 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreProductServiceImpl.java @@ -82,4 +82,5 @@ public class InvPreProductServiceImpl implements InvPreProductService { public boolean deleteById(String id) { return invPreProductDao.deleteById(id); } + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java index b61f6cb..4bd7631 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java @@ -12,6 +12,12 @@ public interface SupCertService { SupCertEntity findCompanyCertByName(String name); + List findAll(String customerId); + + List findAll(String customerId, String manufacturerId); + + List findAll(String customerId, String manufacturerId, String productId); + List getCompanyCert(FilterSupCertRequest filterSupCertRequest); boolean updateCompanyCert(SupCertEntity supCertEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java new file mode 100644 index 0000000..f6392c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java @@ -0,0 +1,19 @@ +package com.glxp.sale.admin.service.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; + +import java.util.List; + +public interface SupCertSetService { + + + List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); + + boolean updateCertSet(SupCertSetEntity supCertSetEntity); + + boolean insertCertSet(SupCertSetEntity supCertSetEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java index 9a6b7ea..6262bf2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java @@ -1,7 +1,6 @@ package com.glxp.sale.admin.service.purchase; - import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; @@ -11,6 +10,8 @@ public interface SupManufacturerService { SupManufacturerEntity findCompany(Long id); + SupManufacturerEntity findManufacturer(String manufacturerId); + SupManufacturerEntity findCompanyByName(String companyName); List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); 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 065fa71..2ec2ffe 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 @@ -11,6 +11,8 @@ public interface SupProductService { SupProductEntity findRegistration(Long id); + SupProductResponse findByProductId(String productId); + SupProductResponse findJoinRegistration(Long id); SupProductEntity findRegistrationByName(String recordProductName); 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 99b3079..b506619 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 @@ -1,6 +1,8 @@ package com.glxp.sale.admin.service.purchase.impl; +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.SupCertDao; import com.glxp.sale.admin.entity.purchase.SupCertEntity; import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; @@ -46,6 +48,42 @@ public class SupCertServiceImpl implements SupCertService { return supCertDao.findCompanyCertByName(companyName); } + @Override + public List findAll(String customerId) { + if (StrUtil.isEmpty(customerId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + + @Override + public List findAll(String customerId, String manufacturerId) { + if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + + @Override + public List findAll(String customerId, String manufacturerId, String productId) { + if (StrUtil.isEmpty(customerId) || StrUtil.isEmpty(manufacturerId) || StrUtil.isEmpty(productId)) + return null; + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + filterSupCertRequest.setProductIdFk(productId); + filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertEntityList = supCertDao.filterCompanyCert(filterSupCertRequest); + return supCertEntityList; + } + @Override public boolean updateCompanyCert(SupCertEntity supCertEntity) { return supCertDao.updateCompanyCert(supCertEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java new file mode 100644 index 0000000..c47e395 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java @@ -0,0 +1,48 @@ +package com.glxp.sale.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.purchase.SupCertSetDao; +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; +import com.glxp.sale.admin.service.purchase.SupCertSetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCertSetServiceImpl implements SupCertSetService { + + @Resource + SupCertSetDao supCertSetDao; + + @Override + public List filterCertSets(FilterCertSetsRequest filterCertSetsRequest) { + + if (filterCertSetsRequest == null) { + return Collections.emptyList(); + } + if (filterCertSetsRequest.getPage() != null) { + int offset = (filterCertSetsRequest.getPage() - 1) * filterCertSetsRequest.getLimit(); + PageHelper.offsetPage(offset, filterCertSetsRequest.getLimit()); + } + return supCertSetDao.filterCertSets(filterCertSetsRequest); + + } + + @Override + public boolean updateCertSet(SupCertSetEntity supCertSetEntity) { + return supCertSetDao.updateCertSet(supCertSetEntity); + } + + @Override + public boolean insertCertSet(SupCertSetEntity supCertSetEntity) { + return supCertSetDao.insertCertSet(supCertSetEntity); + } + + @Override + public boolean deleteById(String id) { + return supCertSetDao.deleteById(id); + } +} 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 75365c1..9cf8d86 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 @@ -1,5 +1,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.dao.purchase.SupManufacturerDao; import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; @@ -22,6 +24,21 @@ public class SupManufacturerServiceImpl implements SupManufacturerService { return supManufacturerDao.findCompany(id); } + @Override + public SupManufacturerEntity findManufacturer(String manufacturerId) { + + if (StrUtil.isEmpty(manufacturerId)) { + return null; + } + FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); + filterSupManufacturerRequest.setManufacturerId(manufacturerId); + List companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); + if (CollUtil.isNotEmpty(companyEntities)) { + return companyEntities.get(0); + } + return null; + } + @Override public SupManufacturerEntity findCompanyByName(String companyName) { return supManufacturerDao.findCompanyByName(companyName); 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 6ced7cb..0cfbaf4 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 @@ -1,6 +1,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.dao.purchase.SupProductDao; import com.glxp.sale.admin.entity.purchase.SupProductEntity; @@ -24,6 +25,20 @@ public class SupProductServiceImpl implements SupProductService { return supProductDao.findRegistration(id); } + @Override + public SupProductResponse findByProductId(String productId) { + + if (StrUtil.isEmpty(productId)) { + return null; + } + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + filterPoductRequest.setProductId(productId); + 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/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index f333170..af1d5dd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -98,27 +98,32 @@ public class InvProductsTrService { ErpOrderEntity erpOrderEntity = getErpOrders(warehouseEntity, erpOrderEntities); if (bussinessTypeEntity.isPreIn()) { - InvProductEntity invPreProductEntity = - invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() - , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); + InvProductEntity invPreProductEntity = null; +// invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() +// , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); if (invPreProductEntity == null) { - invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity); + invPreProductEntity = buildInvPreInProduct(orderEntity, erpOrderEntity, warehouseEntity); invPreProductEntity.setUpdateTime(new Date()); invPreInProductService.insertInvProduct(invPreProductEntity); - } else { - int actCount = getActCount(warehouseEntity); - int count = actCount * warehouseEntity.getCount(); - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count); - } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); - } - if (erpOrderEntity.getPrice() != null) { - invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); - } - invPreProductEntity.setUpdateTime(new Date()); - invPreInProductService.updateInvProduct(invPreProductEntity); } + + /** + * else { + * int actCount = getActCount(warehouseEntity); + * int count = actCount * warehouseEntity.getCount(); + * if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + * invPreProductEntity.setOutCount(invPreProductEntity.getOutCount() + count); + * } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + * invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count); + * } + * if (erpOrderEntity.getPrice() != null) { + * invPreProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + * } + * invPreProductEntity.setUpdateTime(new Date()); + * invPreInProductService.updateInvProduct(invPreProductEntity); + * } + */ + } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库 InvProductEntity invPreProductEntity = invPreProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() @@ -165,21 +170,23 @@ public class InvProductsTrService { } if (orderEntity.isPreCheck()) { - int actCount = getActCount(warehouseEntity); - int count = actCount * warehouseEntity.getCount(); - InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), - warehouseEntity.getSupId(), null, null); - if (preInvEntity != null) { - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - preInvEntity.setOutCount(preInvEntity.getOutCount() + count); - } - if (erpOrderEntity.getPrice() != null) { - preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); - } - preInvEntity.setUpdateTime(new Date()); - invPreInProductService.updateInvProduct(preInvEntity); - } + //暂时不需要去计算库存 +// int actCount = getActCount(warehouseEntity); +// int count = actCount * warehouseEntity.getCount(); +// InvProductEntity preInvEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), +// warehouseEntity.getSupId(), null, null); +// +// if (preInvEntity != null) { +// if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { +// preInvEntity.setOutCount(preInvEntity.getOutCount() + count); +// } +// if (erpOrderEntity.getPrice() != null) { +// preInvEntity.setPrice(erpOrderEntity.getPrice() + ""); +// } +// preInvEntity.setUpdateTime(new Date()); +// invPreInProductService.updateInvProduct(preInvEntity); +// } } @@ -207,10 +214,10 @@ public class InvProductsTrService { } else { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); //todo 为什么要插入库存 - if (orderEntity.isPreCheck()) { -// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 - invPreInProductDetailService.insertInvProducts(invProductDetailEntities); - } +// if (orderEntity.isPreCheck()) { +//// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 +// invPreInProductDetailService.insertInvProducts(invProductDetailEntities); +// } } if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) { mInvProductDetailEntities.addAll(invProductDetailEntities); @@ -866,6 +873,38 @@ public class InvProductsTrService { return invProductEntity; } + //生成预验收库存 + private InvProductEntity buildInvPreInProduct(OrderEntity orderEntity, ErpOrderEntity erpOrderEntity, WarehouseEntity warehouseEntity) { + InvProductEntity invProductEntity = new InvProductEntity(); + invProductEntity.setRelIdFk(erpOrderEntity.getGoodsid()); + if (StrUtil.isNotEmpty(erpOrderEntity.getBatchNo())) { + invProductEntity.setBatchNo(erpOrderEntity.getBatchNo()); + } else + invProductEntity.setBatchNo(null); + invProductEntity.setCustomerId(orderEntity.getCustomerId()); + invProductEntity.setExpireDate(erpOrderEntity.getExpireDate()); + invProductEntity.setProductionDate(erpOrderEntity.getProductDate()); + invProductEntity.setGgxh(erpOrderEntity.getPackSpec()); + invProductEntity.setSupId(warehouseEntity.getSupId()); + invProductEntity.setNameCode(erpOrderEntity.getNameCode()); + invProductEntity.setPrice(erpOrderEntity.getPrice() + ""); + invProductEntity.setProductsName(erpOrderEntity.getCoName()); + invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany()); + invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode()); + invProductEntity.setInvStorageCode(warehouseEntity.getLocStorageCode()); + invProductEntity.setOrderIdFk(orderEntity.getId()); + invProductEntity.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); + int count = getActCount(warehouseEntity) * warehouseEntity.getCount(); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + invProductEntity.setOutCount(count); + } else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + invProductEntity.setInCount(count); + } + + return invProductEntity; + } + + //生成库存条码 private List buildInvProductDetail(String orderId, ErpOrderEntity erpOrderEntity, OrderEntity orderEntity, Integer purchaseType) { @@ -1049,30 +1088,6 @@ public class InvProductsTrService { } - //根据条码获取预入库结余数量 - public int getPreCountByOrder(String mainAction, String code, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setCode(code); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - - } - } - return invCount; - } - - public int getPreCountByOrder(String mainAction, String relId, String batchNo, String supId, String invWarehouseCode) { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setSupId(supId); @@ -1097,53 +1112,6 @@ public class InvProductsTrService { } - //根据条码获取库存结余数量 - public int getCountByProduct(String mainAction, String productId, String batchNo, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setProductIdFk(productId); - filterInvProductDetailRequest.setBatchNo(batchNo); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - } - } - return invCount; - } - - //根据条码获取预入库结余数量 - public int getPreCountByProduct(String mainAction, String productId, String batchNo, String supId) { - FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); - filterInvProductDetailRequest.setProductIdFk(productId); - filterInvProductDetailRequest.setBatchNo(batchNo); - filterInvProductDetailRequest.setSupId(supId); - if (mainAction != null) - filterInvProductDetailRequest.setMainAction(mainAction); - List detailJoinResponseList - = invPreProductDetailService.filterJoinInvProduct(filterInvProductDetailRequest); - int invCount = 0; - if (detailJoinResponseList != null && detailJoinResponseList.size() > 0) { - for (InvProductDetailJoinResponse invProductDetailJoinResponse : detailJoinResponseList) { - if (invProductDetailJoinResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailJoinResponse.getCount(); - } else { - invCount = invCount + invProductDetailJoinResponse.getCount(); - } - - } - } - return invCount; - } - //合并条码 public List filterMapCodes(List warehouseEntityList) { Map filterMap = new HashMap<>(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 26bdc9f..d08fb21 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -41,9 +41,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.function.BiConsumer; @Service public class IoTransInoutService { @@ -93,7 +92,14 @@ public class IoTransInoutService { UdimsOrderDetailDao udimsOrderDetailDao; @Resource GennerOrderUtils gennerOrderUtils; - + @Resource + InvPreInProductService invPreInProductService; + @Resource + InvPreInProductDetailService invPreInProductDetailService; + @Resource + InvPreProductDetailService invPreProductDetailService; + @Resource + InvProductDetailService invProductDetailService; //手持终端生成订单，插入零时表 @Async @@ -497,10 +503,6 @@ public class IoTransInoutService { } } - @Resource - InvPreProductDetailService invPreProductDetailService; - @Resource - InvProductDetailService invProductDetailService; public String checkOriginCode(WarehouseEntity warehouseEntity, BussinessTypeEntity bussinessTypeEntity) { @@ -839,8 +841,8 @@ public class IoTransInoutService { public void syncprintOrder(String orderId) { OrderEntity orderEntity = orderService.findById(orderId); BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); - if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS && StrUtil.isEmpty(orderEntity.getErpFk()) - ) { + if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS + && StrUtil.isEmpty(orderEntity.getErpFk())) { //查询单据校验后生成的单据详情 FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); @@ -935,8 +937,36 @@ public class IoTransInoutService { stockOrderEntity.setOrderIdFk(orderEntity.getId()); stockOrderService.updateById(stockOrderEntity); } + } + + + //预验收出库，1：删除对应的预验收库存；2.把预验收单关联到对应的扫码单据与业务单据 + if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { + List codeList = warehouseService.findByReceiptId(orderEntity.getId()); + Map preInOrder = new HashMap<>(); + for (WarehouseEntity warehouseEntity : codeList) { + List invProductDetailEntities = invPreInProductDetailService.findByOriginCode(warehouseEntity.getCode()); + if (invProductDetailEntities.size() > 0) { + preInOrder.put(invProductDetailEntities.get(0).getOrderIdFk(), invProductDetailEntities.get(0).getOrderIdFk()); + } + } + if (preInOrder.size() > 0) { + String preInBillNo = ""; + for (String key : preInOrder.keySet()) { + preInBillNo = preInBillNo + "," + key; + OrderEntity preInEntity = orderService.findById(key); + preInEntity.setPreOutBillNo(orderEntity.getId()); + orderService.updateOrder(preInEntity); + invPreInProductService.deleteByOrderIdFk(preInEntity.getId()); + invPreInProductDetailService.deleteByOrderIdFk(preInEntity.getId()); + } + orderEntity.setPreInBillNo(preInBillNo.substring(1)); + orderService.updateOrder(orderEntity); + } + } + } @@ -995,7 +1025,6 @@ public class IoTransInoutService { } } else { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); - orderEntity.setReceiveStatus(1); // invProductsTrService.genInvProducts(orderEntity.getId()); } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml index d8e3932..d8c1268 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerContactDao.xml @@ -16,7 +16,7 @@ + parameterType="com.glxp.sale.admin.entity.auth.CustomerContactEntity"> INSERT INTO customer_contact ( customerId, contacts, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 7b889a7..25bb0d5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -31,7 +31,7 @@ basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid ,basic_products.basicPrductRemak1 ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 - ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 + ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,basic_products.hchzsb FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index 517ca6a..0b5d4e3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -34,7 +34,7 @@ receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck) + fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) values (#{id}, #{action}, #{corpOrderId}, @@ -57,7 +57,7 @@ #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode}, #{deptCode}, #{printRemark}, - #{codeFillCheck}) + #{codeFillCheck},#{preInBillNo},#{preOutBillNo}) @@ -69,7 +69,7 @@ receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, - fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck) + fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck,preInBillNo,preOutBillNo) values (#{id}, #{action}, #{corpOrderId}, @@ -106,7 +106,7 @@ #{invStorageCode}, #{deptCode}, #{printRemark}, - #{codeFillCheck}) + #{codeFillCheck},#{preInBillNo},#{preOutBillNo}) @@ -149,6 +149,9 @@ deptCode=#{deptCode}, printRemark=#{printRemark}, codeFillCheck=#{codeFillCheck}, + preInBillNo=#{preInBillNo}, + preOutBillNo=#{preOutBillNo}, + WHERE id = #{id} @@ -652,7 +655,7 @@ 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 1c1aac8..45d1557 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml @@ -124,7 +124,7 @@ ,inv_prein_product.reCount,inv_prein_product.customerId, basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name - invSubStorageName,inv_prein_product.invWarehouseCode + invSubStorageName,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk FROM inv_prein_product inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid @@ -203,13 +203,14 @@ insert INTO inv_prein_product (productsName, nameCode, relIdFk, ggxh, batchNo, productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, - inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price, updateTime) + inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price, updateTime, + orderIdFk) values (#{productsName}, #{nameCode}, #{relIdFk}, #{ggxh}, #{batchNo}, #{productionDate}, #{expireDate}, #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk} - , #{invStorageCode}, #{invWarehouseCode}, #{price}, #{updateTime}) + , #{invStorageCode}, #{invWarehouseCode}, #{price}, #{updateTime}, #{orderIdFk}) @@ -219,6 +220,13 @@ WHERE id = #{id} + + + DELETE + FROM inv_prein_product + WHERE orderIdFk = #{orderIdFk} + + DELETE FROM inv_prein_product @@ -246,7 +254,7 @@ price=#{price}, invWarehouseCode=#{invWarehouseCode}, updateTime=#{updateTime}, - + orderIdFk=#{orderIdFk}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index 058ce8d..abb9254 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -54,7 +54,6 @@ and manufacturerIdFk = #{manufacturerIdFk} - @@ -76,6 +75,7 @@ `code`=#{code}, `auditStatus`=#{auditStatus}, `auditComment`=#{auditComment}, + `status`=#{status}, WHERE id = #{id} @@ -111,7 +111,7 @@ INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime , vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus - , auditComment) + , auditComment,status) values (#{name}, #{customerId}, #{filePath}, @@ -120,7 +120,7 @@ #{updateTime}, #{vailDate}, #{expireDate}, - #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment}) + #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment},#{status}) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml new file mode 100644 index 0000000..f75202c --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -0,0 +1,60 @@ + + + + + + + + + + DELETE + FROM sup_cert_set + WHERE id = #{id} + + + + + UPDATE sup_cert_set + + name=#{name}, + `need`=#{need}, + `foreign`=#{foreign}, + remark=#{remark}, + cplx=#{cplx}, + updateTime=#{updateTime}, + hchzsb=#{hchzsb}, + flbm=#{flbm}, + `imports`=#{imports}, + `type`=#{type}, + + WHERE id = #{id} + + + + + INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports,`type`) + values (#{name}, + #{need}, + #{foreign}, + #{remark}, + #{cplx}, + #{updateTime}, + #{hchzsb}, + #{flbm}, + #{imports},#{type}) + + + + \ No newline at end of file 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 ff7f70f..eb3d568 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -7,14 +7,14 @@ delete - from sup_company + from company where customerId = #{customerId} @@ -56,13 +56,13 @@ resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity"> SELECT * - FROM sup_company + FROM company where companyName = #{companyName} - SELECT sup_manufacturer.* ,sup_company.companyName supName FROM sup_manufacturer - inner join sup_company on sup_manufacturer.customerId = sup_company.customerId + SELECT sup_manufacturer.* ,company.companyName supName FROM sup_manufacturer + inner join company on sup_manufacturer.customerId = company.customerId and id = #{id} 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 2cace2c..0ce2d45 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -19,10 +19,10 @@