From de7c413d6876ec52ea3304a7c9d57aaaa7bb82cc Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 21 Mar 2023 11:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=BD=95=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 23 +- .../inout/IoOrderReviewController.java | 22 ++ .../glxp/api/dao/purchase/SupProductDao.java | 4 +- .../api/req/purchase/FilterPoductRequest.java | 1 + .../service/purchase/SupProductService.java | 4 +- .../purchase/impl/SupProductServiceImpl.java | 9 + .../mybatis/mapper/purchase/SupProductDao.xml | 354 +++++++++++------- 7 files changed, 279 insertions(+), 138 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 5fc60ab2..9416701e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -16,6 +16,8 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.purchase.SupProductEntity; +import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; @@ -30,6 +32,7 @@ import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; import com.glxp.api.service.purchase.SupProductService; +import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrOrderDetailService; import com.glxp.api.service.thrsys.ThrOrderService; import com.glxp.api.service.thrsys.ThrSystemBusApiService; @@ -90,14 +93,18 @@ public class IoOrderDetailBizController extends BaseController { pageSimpleResponse.setList(orderEntityList); return ResultVOUtils.success(pageSimpleResponse); } + @Resource SupProductService supProductService; + @Resource + SystemParamConfigService systemParamConfigService; //录入业务单据详情 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addBizProduct") public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) { - + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); + boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; AuthAdmin authAdmin = getUser(); if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas())) return ResultVOUtils.error(500, "未选择产品信息"); @@ -140,7 +147,18 @@ public class IoOrderDetailBizController extends BaseController { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId()); // todo 查询产品是否已经通过认证 -// 1111 + + if (isVailCert && udiRelevanceResponse.isNeedCert()) { + + SupProductEntity supProductEntity = supProductService.findByRelIdFk(udiRelevanceResponse.getId() + ""); + if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { + + } else { + return ResultVOUtils.error(500, "产品资质证书未通过审核！"); + } + + + } IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo()); @@ -168,7 +186,6 @@ public class IoOrderDetailBizController extends BaseController { } - //修改业务单据详情 @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/updateBizProduct") diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index b8feb25a..d7deaad8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -83,6 +83,28 @@ public class IoOrderReviewController extends BaseController { } + //获取验收单据业务详情 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/stock/order/accept/getStatus") + public BaseResponse getStatus(String billNo) { + if (StrUtil.isBlank(billNo)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + AcceptOrderResponse acceptOrderEntity = new AcceptOrderResponse(); + acceptOrderEntity.setBillNo(billNo); + List datas = (List) redisUtil.get(ConstantStatus.REDIS_BILLNO + billNo); + if (CollUtil.isNotEmpty(datas)) { + boolean isFinish = vailFinish(datas); + if (isFinish) + return ResultVOUtils.success("单据已验收完成"); + else + return ResultVOUtils.error(500, "单据未验收完成"); + } else { + return ResultVOUtils.error(500, "单据未验收完成"); + } + + } + //前端二次审核 @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index 92c0e94f..29055f83 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -1,6 +1,8 @@ package com.glxp.api.dao.purchase; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; @@ -10,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SupProductDao { +public interface SupProductDao extends BaseMapper { SupProductEntity findRegistration(Long id); diff --git a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java index 3101ac03..b36a4673 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java @@ -19,4 +19,5 @@ public class FilterPoductRequest extends ListPageRequest { private String customerId; private Integer auditStatus; private String lastUpdateTime; + private String relIdFk; } diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index 461e5a72..bcc7a079 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -14,6 +14,8 @@ public interface SupProductService { SupProductResponse findByProductId(String productId); + SupProductEntity findByRelIdFk(String relIdFk); + SupProductResponse findByPassByReCert(String registerCert); SupProductResponse findJoinRegistration(Long id); @@ -31,4 +33,4 @@ public interface SupProductService { boolean deleteById(@Param("id") String id); boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 4ee740a6..919ba7d0 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupProductDao; @@ -67,6 +68,14 @@ public class SupProductServiceImpl implements SupProductService { return null; } + @Override + public SupProductEntity findByRelIdFk(String relIdFk) { + List supProductEntities = supProductDao.selectList(new QueryWrapper().eq("relIdFk", relIdFk).last("LIMIT 1")); + if (CollUtil.isNotEmpty(supProductEntities)) + return supProductEntities.get(0); + else return null; + } + @Override public SupProductEntity findRegistrationByName(String recordProductName) { return supProductDao.findRegistrationByName(recordProductName); diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index 36b9bd74..5928e8f4 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -2,7 +2,6 @@ - - SELECT sup_product.* FROM sup_product + SELECT sup_product.* + FROM sup_product and sup_product.id = #{id} @@ -30,14 +30,19 @@ and sup_product.enterpriseId = #{enterpriseId} + + and sup_product.relIdFk = #{relIdFk} + + + - and sup_product.recordCode like concat('%',#{recordCode},'%') + and sup_product.recordCode like concat('%', #{recordCode}, '%') - and sup_product.recordProductName like concat('%',#{recordProductName},'%') + and sup_product.recordProductName like concat('%', #{recordProductName}, '%') - and sup_product.recordPeopleName like concat('%',#{recordPeopleName},'%') + and sup_product.recordPeopleName like concat('%', #{recordPeopleName}, '%') and sup_product.manufacturerIdFk = #{manufacturerIdFk} @@ -45,21 +50,24 @@ and sup_product.customerId = #{customerId} - + and sup_product.auditStatus = #{auditStatus} - - and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or - sup_product.auditStatus=2) + + and (sup_product.auditStatus = 0 or sup_product.auditStatus = 5 or + sup_product.auditStatus = 2) - - and 0 ]]> + + and 0 + ]]> - - and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 ) + + and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4) - - = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') + ]]> @@ -67,19 +75,22 @@ - UPDATE sup_product - enterpriseId=#{enterpriseId}, - recordCode=#{recordCode}, - recordProductName=#{recordProductName}, - productManageType=#{productManageType}, - recordPeopleName=#{recordPeopleName}, - recordPeopleArea=#{recordPeopleArea}, - recordPeopleAreaCode=#{recordPeopleAreaCode}, - recordPeopleAddress=#{recordPeopleAddress}, - productType=#{productType}, - productDirectoryCode=#{productDirectoryCode}, - agentName=#{agentName}, - agentArea=#{agentArea}, - agentAreaCode=#{agentAreaCode}, - agentAddress=#{agentAddress}, - instructions=#{instructions}, - productAddress=#{productAddress}, - recordText=#{recordText}, - placeOrigin=#{placeOrigin}, - productionRegion=#{productionRegion}, - productionCompanyName=#{productionCompanyName}, - afterSale=#{afterSale}, - specification=#{specification}, - structure=#{structure}, - scope=#{scope}, - other=#{other}, - filePath=#{filePath}, - remark=#{remark}, - createTime=#{createTime}, - updateTime=#{updateTime}, - manufacturerIdFk=#{manufacturerIdFk}, - customerId=#{customerId}, - productId=#{productId}, - auditStatus=#{auditStatus}, - auditComment=#{auditComment}, - sptm=#{sptm}, - ybbm=#{ybbm}, - measname=#{measname}, - cpms=#{cpms}, - hchzsb=#{hchzsb}, - relIdFk=#{relIdFk}, - - + + enterpriseId=#{enterpriseId}, + + + recordCode=#{recordCode}, + + + recordProductName=#{recordProductName}, + + + productManageType=#{productManageType}, + + + recordPeopleName=#{recordPeopleName}, + + + recordPeopleArea=#{recordPeopleArea}, + + + recordPeopleAreaCode=#{recordPeopleAreaCode}, + + + recordPeopleAddress=#{recordPeopleAddress}, + + + productType=#{productType}, + + + productDirectoryCode=#{productDirectoryCode}, + + + agentName=#{agentName}, + + + agentArea=#{agentArea}, + + + agentAreaCode=#{agentAreaCode}, + + + agentAddress=#{agentAddress}, + + + instructions=#{instructions}, + + + productAddress=#{productAddress}, + + + recordText=#{recordText}, + + + placeOrigin=#{placeOrigin}, + + + productionRegion=#{productionRegion}, + + + productionCompanyName=#{productionCompanyName}, + + + afterSale=#{afterSale}, + + + specification=#{specification}, + + + structure=#{structure}, + + + scope=#{scope}, + + + other=#{other}, + + + filePath=#{filePath}, + + + remark=#{remark}, + + + createTime=#{createTime}, + + + updateTime=#{updateTime}, + + + manufacturerIdFk=#{manufacturerIdFk}, + + + customerId=#{customerId}, + + + productId=#{productId}, + + + auditStatus=#{auditStatus}, + + + auditComment=#{auditComment}, + + + sptm=#{sptm}, + + + ybbm=#{ybbm}, + + + measname=#{measname}, + + + cpms=#{cpms}, + + + hchzsb=#{hchzsb}, + + + relIdFk=#{relIdFk}, + - WHERE id=#{id} - + WHERE id = #{id} replace - INTO sup_product(enterpriseId, recordCode, recordProductName, - productManageType, recordPeopleName, recordPeopleArea, - recordPeopleAreaCode, recordPeopleAddress, productType, - productDirectoryCode, agentName, agentArea, - agentAreaCode, agentAddress, instructions, - productAddress, recordText, placeOrigin, - productionRegion, productionCompanyName, afterSale, - specification, structure, `scope`, - other, filePath, remark, - createTime, updateTime, manufacturerIdFk, customerId, productId - , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb,relIdFk) - values ( - #{enterpriseId}, - #{recordCode}, - #{recordProductName}, - #{productManageType}, - #{recordPeopleName}, - #{recordPeopleArea}, - #{recordPeopleAreaCode}, - #{recordPeopleAddress}, - #{productType}, - #{productDirectoryCode}, - #{agentName}, - #{agentArea}, - #{agentAreaCode}, - #{agentAddress}, - #{instructions}, - #{productAddress}, - #{recordText}, - #{placeOrigin}, - #{productionRegion}, - #{productionCompanyName}, - #{afterSale}, - #{specification}, - #{structure}, - #{scope}, - #{other}, - #{filePath}, - #{remark}, - #{createTime}, - #{updateTime}, - #{manufacturerIdFk}, - #{customerId}, - #{productId} - , - #{auditStatus}, - #{auditComment}, - #{sptm}, - #{ybbm}, - #{measname}, - #{cpms}, - #{hchzsb},#{relIdFk} - ) + INTO sup_product(enterpriseId, recordCode, recordProductName, + productManageType, recordPeopleName, recordPeopleArea, + recordPeopleAreaCode, recordPeopleAddress, productType, + productDirectoryCode, agentName, agentArea, + agentAreaCode, agentAddress, instructions, + productAddress, recordText, placeOrigin, + productionRegion, productionCompanyName, afterSale, + specification, structure, `scope`, + other, filePath, remark, + createTime, updateTime, manufacturerIdFk, customerId, productId + , auditStatus, auditComment, sptm, ybbm, measname, cpms, hchzsb, relIdFk) + values (#{enterpriseId}, + #{recordCode}, + #{recordProductName}, + #{productManageType}, + #{recordPeopleName}, + #{recordPeopleArea}, + #{recordPeopleAreaCode}, + #{recordPeopleAddress}, + #{productType}, + #{productDirectoryCode}, + #{agentName}, + #{agentArea}, + #{agentAreaCode}, + #{agentAddress}, + #{instructions}, + #{productAddress}, + #{recordText}, + #{placeOrigin}, + #{productionRegion}, + #{productionCompanyName}, + #{afterSale}, + #{specification}, + #{structure}, + #{scope}, + #{other}, + #{filePath}, + #{remark}, + #{createTime}, + #{updateTime}, + #{manufacturerIdFk}, + #{customerId}, + #{productId} + , + #{auditStatus}, + #{auditComment}, + #{sptm}, + #{ybbm}, + #{measname}, + #{cpms}, + #{hchzsb}, #{relIdFk}) @@ -237,5 +326,4 @@ FROM sup_product WHERE enterpriseId = #{enterpriseId} -