From bc7237177c75d8c1236e6c3f31bf52928a8aece5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 11 Aug 2023 09:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRlSupController.java | 1 - .../inout/IoCodeTempController.java | 47 +++++++++---------- .../purchase/PurApplyController.java | 5 -- .../basic/CompanyProductsRelService.java | 37 --------------- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 4 +- .../mybatis/mapper/basic/UdiRlSupDao.xml | 3 -- 6 files changed, 23 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 8718cae0..9e8c5233 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -185,7 +185,6 @@ public class UdiRlSupController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyProductRelevance") public BaseResponse getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) { -// filterCompanyProductRelevanceRequest.setCustomerId(getCustomerId()); List companyProductRelevanceEntities = udiRlSupService.getCompanyProductRelevance(filterCompanyProductRelevanceRequest); PageInfo pageInfo = new PageInfo<>(companyProductRelevanceEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 5c74bdde..56cf6c42 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -761,8 +761,6 @@ public class IoCodeTempController extends BaseController { orderEntity.setBusType(bussinessTypeEntity.getBusType()); orderService.insertOrder(orderEntity); } - - if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) { boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo()); if (!isBillExit) { @@ -770,8 +768,25 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "请先录入业务详情"); } } - BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); + BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity); + if (invRes != null) { + return invRes; + } + genDetaiEntity = codeEnttity; + if (baseResponse == null) { + baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk); + if (baseResponse != null) + return baseResponse; + } else { + if (baseResponse.getCode() == 501) { + return baseResponse; + } else if (baseResponse.getCode() == 502) { + return baseResponse; + } + checkSupId(bussinessTypeEntity, codeEnttity, unitFk); + return baseResponse; + } if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory()); @@ -791,27 +806,7 @@ public class IoCodeTempController extends BaseController { } else { return ResultVOUtils.error(500, "产品资质证书未通过审核！"); } - - } - } - - BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity); - if (invRes != null) { - return invRes; - } - genDetaiEntity = codeEnttity; - if (baseResponse == null) { - baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk); - if (baseResponse != null) - return baseResponse; - } else { - if (baseResponse.getCode() == 501) { - return baseResponse; - } else if (baseResponse.getCode() == 502) { - return baseResponse; } - checkSupId(bussinessTypeEntity, codeEnttity, unitFk); - return baseResponse; } //是否边扫边校验 @@ -1208,9 +1203,9 @@ public class IoCodeTempController extends BaseController { @PostMapping("warehouse/inout/checkTempCode") public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) { - Boolean falg=codeTempService.checkTempCode(codeTempEntity); - if(!falg){ - return ResultVOUtils.error(999,"该产品已存在，请勿重复录入"); + Boolean falg = codeTempService.checkTempCode(codeTempEntity); + if (!falg) { + return ResultVOUtils.error(999, "该产品已存在，请勿重复录入"); } return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 8ab2644b..85606c90 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -68,11 +68,6 @@ public class PurApplyController { CustomerService customerService; @Resource GennerOrderUtils gennerOrderUtils; - @Resource - UdiRelevanceService udiRelevanceService; - @Resource - UdiRlSupService udiRlSupService; - @Resource IBasicBussinessTypeService basicBussinessTypeService; /** diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index 724550ac..cb4282bb 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -19,8 +19,6 @@ import java.util.List; @Service public class CompanyProductsRelService { - @Resource - private UdiRlSupService udiRlSupService; @Resource UdiRelevanceService udiRelevanceService; @Resource @@ -57,43 +55,8 @@ public class CompanyProductsRelService { } companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId() + ""); boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); - - } - - } else {//一键导出 //todo暂时去掉 -// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); -// filterUdiInfoRequest.setPage(null); -// List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); -// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { -// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); -// companyProductRelevanceEntity.setCreate_time(new Date()); -// companyProductRelevanceEntity.setUpdate_time(new Date()); -// companyProductRelevanceEntity.setAuditStatus("3"); -// companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk()); -// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId()); -// companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid()); -// companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId()); -// boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); -// } } - } else {//一键导出 //todo暂时去掉 -// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); -// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); -// filterUdiInfoRequest.setPage(null); -// List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); -// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { -// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); -// companyProductRelevanceEntity.setCreate_time(new Date()); -// companyProductRelevanceEntity.setUpdate_time(new Date()); -// companyProductRelevanceEntity.setAuditStatus("3"); -// companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk()); -// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId()); -// companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid()); -// companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId()); -// boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); -// } } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 79c51809..22d91546 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1038,7 +1038,7 @@ isLock, lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, - remark, useExpireTime, dispatch, groupBuy，needCert) + remark, useExpireTime, dispatch, groupBuy,needCert) values @@ -1064,7 +1064,7 @@ #{item.modifyTime}, #{item.createUser}, #{item.updateUser}, - #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}，#{item.needCert}) + #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert}) diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index d32ebb42..2059dd61 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -46,13 +46,10 @@ basic_udirel.lockStatus, basic_udirel.mainId, basic_udirel.isAdavence, - basic_udirel.lowStockNum, basic_udirel.overStockNum, basic_udirel.recentDateTime, basic_udirel.isDateBy, - - bht.name classifyName, basic_products.id as PRId, basic_products.originUuid,