UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

产品录入时添加资质证书校验

Browse Source
master
anthonywj 2 years ago
parent 74836b0047
commit de7c413d68
7 changed files with 279 additions and 138 deletions
Show Stats Download Patch File Download Diff File

23
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -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")

22
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -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<IoOrderDetailResultResponse> datas = (List<IoOrderDetailResultResponse>) 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("")

4
src/main/java/com/glxp/api/dao/purchase/SupProductDao.java
Unescape Escape View File

@ -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> {
SupProductEntity findRegistration(Long id);

1
src/main/java/com/glxp/api/req/purchase/FilterPoductRequest.java
Unescape Escape View File

@ -19,4 +19,5 @@ public class FilterPoductRequest extends ListPageRequest {
private String customerId;
private Integer auditStatus;
private String lastUpdateTime;
private String relIdFk;
}

4
src/main/java/com/glxp/api/service/purchase/SupProductService.java
Unescape Escape View File

@ -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);
}
}

9
src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
Unescape Escape View File

@ -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<SupProductEntity> supProductEntities = supProductDao.selectList(new QueryWrapper<SupProductEntity>().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);

354
src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.purchase.SupProductDao">
<select id="findRegistration" parameterType="java.lang.Long"
resultType="com.glxp.api.entity.purchase.SupProductEntity">
SELECT *
@ -19,7 +18,8 @@
<select id="filterProducts" parameterType="com.glxp.api.req.purchase.FilterPoductRequest"
resultType="com.glxp.api.entity.purchase.SupProductEntity">
SELECT sup_product.* FROM sup_product
SELECT sup_product.*
FROM sup_product
<where>
<if test="id != null and id != ''">
and sup_product.id = #{id}
@ -30,14 +30,19 @@
<if test="enterpriseId != null and enterpriseId != ''">
and sup_product.enterpriseId = #{enterpriseId}
</if>
<if test="relIdFk != null and relIdFk != ''">
and sup_product.relIdFk = #{relIdFk}
</if>
<if test="recordCode != null and recordCode != ''">
and sup_product.recordCode like concat('%',#{recordCode},'%')
and sup_product.recordCode like concat('%', #{recordCode}, '%')
</if>
<if test="recordProductName != null and recordProductName != ''">
and sup_product.recordProductName like concat('%',#{recordProductName},'%')
and sup_product.recordProductName like concat('%', #{recordProductName}, '%')
</if>
<if test="recordPeopleName != null and recordPeopleName != ''">
and sup_product.recordPeopleName like concat('%',#{recordPeopleName},'%')
and sup_product.recordPeopleName like concat('%', #{recordPeopleName}, '%')
</if>
<if test="manufacturerIdFk != null and manufacturerIdFk != ''">
and sup_product.manufacturerIdFk = #{manufacturerIdFk}
@ -45,21 +50,24 @@
<if test="customerId != null and customerId != ''">
and sup_product.customerId = #{customerId}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=22 and auditStatus !=21">
<if test="auditStatus != null and auditStatus != 20 and auditStatus != 22 and auditStatus != 21">
and sup_product.auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or
sup_product.auditStatus=2)
<if test="auditStatus == 20">
and (sup_product.auditStatus = 0 or sup_product.auditStatus = 5 or
sup_product.auditStatus = 2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ sup_product.auditStatus <> 0 ]]>
<if test="auditStatus == 21">
and <![CDATA[ sup_product.auditStatus <> 0
]]>
</if>
<if test="auditStatus ==22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 )
<if test="auditStatus == 22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4)
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
</select>
@ -67,19 +75,22 @@
<select id="getRegistration" parameterType="com.glxp.api.req.purchase.FilterPoductRequest"
resultType="com.glxp.api.res.purchase.SupProductResponse">
SELECT sup_product.* ,sup_company.companyName
supName,sup_manufacturer.companyName manufacturerName,sup_manufacturer.companyName FROM sup_product
inner join sup_company
on sup_product.customerId = sup_company.customerId
INNER JOIN sup_manufacturer
on sup_manufacturer.manufacturerId =
sup_product.manufacturerIdFk
SELECT sup_product.*,
sup_company.companyName
supName,
sup_manufacturer.companyName manufacturerName,
sup_manufacturer.companyName
FROM sup_product
inner join sup_company
on sup_product.customerId = sup_company.customerId
INNER JOIN sup_manufacturer
on sup_manufacturer.manufacturerId =
sup_product.manufacturerIdFk
<where>
<if test="id != null and id != ''">
and sup_product.id = #{id}
</if>
<if test="productId != null and productId != ''">
and sup_product.productId = #{productId}
</if>
@ -87,13 +98,13 @@
and sup_product.enterpriseId = #{enterpriseId}
</if>
<if test="recordCode != null and recordCode != ''">
and sup_product.recordCode like concat('%',#{recordCode},'%')
and sup_product.recordCode like concat('%', #{recordCode}, '%')
</if>
<if test="recordProductName != null and recordProductName != ''">
and sup_product.recordProductName like concat('%',#{recordProductName},'%')
and sup_product.recordProductName like concat('%', #{recordProductName}, '%')
</if>
<if test="recordPeopleName != null and recordPeopleName != ''">
and sup_product.recordPeopleName like concat('%',#{recordPeopleName},'%')
and sup_product.recordPeopleName like concat('%', #{recordPeopleName}, '%')
</if>
<if test="manufacturerIdFk != null and manufacturerIdFk != ''">
and sup_product.manufacturerIdFk = #{manufacturerIdFk}
@ -101,129 +112,207 @@
<if test="customerId != null and customerId != ''">
and sup_product.customerId = #{customerId}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=22 and auditStatus !=21">
<if test="auditStatus != null and auditStatus != 20 and auditStatus != 22 and auditStatus != 21">
and sup_product.auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or
sup_product.auditStatus=2)
<if test="auditStatus == 20">
and (sup_product.auditStatus = 0 or sup_product.auditStatus = 5 or
sup_product.auditStatus = 2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ sup_product.auditStatus <> 0 ]]>
<if test="auditStatus == 21">
and <![CDATA[ sup_product.auditStatus <> 0
]]>
</if>
<if test="relIdFk != null and relIdFk != ''">
and sup_product.relIdFk = #{relIdFk}
</if>
<if test="auditStatus ==22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 )
<if test="auditStatus == 22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4)
</if>
</where>
</select>
<update id="modifyRegistration" parameterType="com.glxp.api.entity.purchase.SupProductEntity">
UPDATE sup_product
<set>
<if test="enterpriseId != null">enterpriseId=#{enterpriseId},</if>
<if test="recordCode != null">recordCode=#{recordCode},</if>
<if test="recordProductName != null">recordProductName=#{recordProductName},</if>
<if test="productManageType != null">productManageType=#{productManageType},</if>
<if test="recordPeopleName != null">recordPeopleName=#{recordPeopleName},</if>
<if test="recordPeopleArea != null">recordPeopleArea=#{recordPeopleArea},</if>
<if test="recordPeopleAreaCode != null">recordPeopleAreaCode=#{recordPeopleAreaCode},</if>
<if test="recordPeopleAddress != null">recordPeopleAddress=#{recordPeopleAddress},</if>
<if test="productType != null">productType=#{productType},</if>
<if test="productDirectoryCode != null">productDirectoryCode=#{productDirectoryCode},</if>
<if test="agentName != null">agentName=#{agentName},</if>
<if test="agentArea != null">agentArea=#{agentArea},</if>
<if test="agentAreaCode != null">agentAreaCode=#{agentAreaCode},</if>
<if test="agentAddress != null">agentAddress=#{agentAddress},</if>
<if test="instructions != null">instructions=#{instructions},</if>
<if test="productAddress != null">productAddress=#{productAddress},</if>
<if test="recordText != null">recordText=#{recordText},</if>
<if test="placeOrigin != null">placeOrigin=#{placeOrigin},</if>
<if test="productionRegion != null">productionRegion=#{productionRegion},</if>
<if test="productionCompanyName != null">productionCompanyName=#{productionCompanyName},</if>
<if test="afterSale != null">afterSale=#{afterSale},</if>
<if test="specification != null">specification=#{specification},</if>
<if test="structure != null">structure=#{structure},</if>
<if test="scope != null">scope=#{scope},</if>
<if test="other != null">other=#{other},</if>
<if test="filePath != null">filePath=#{filePath},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="manufacturerIdFk != null">manufacturerIdFk=#{manufacturerIdFk},</if>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="productId != null">productId=#{productId},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="auditComment != null">auditComment=#{auditComment},</if>
<if test="sptm != null">sptm=#{sptm},</if>
<if test="ybbm != null">ybbm=#{ybbm},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="cpms != null">cpms=#{cpms},</if>
<if test="hchzsb != null">hchzsb=#{hchzsb},</if>
<if test="relIdFk != null">relIdFk=#{relIdFk},</if>
<if test="enterpriseId != null">
enterpriseId=#{enterpriseId},
</if>
<if test="recordCode != null">
recordCode=#{recordCode},
</if>
<if test="recordProductName != null">
recordProductName=#{recordProductName},
</if>
<if test="productManageType != null">
productManageType=#{productManageType},
</if>
<if test="recordPeopleName != null">
recordPeopleName=#{recordPeopleName},
</if>
<if test="recordPeopleArea != null">
recordPeopleArea=#{recordPeopleArea},
</if>
<if test="recordPeopleAreaCode != null">
recordPeopleAreaCode=#{recordPeopleAreaCode},
</if>
<if test="recordPeopleAddress != null">
recordPeopleAddress=#{recordPeopleAddress},
</if>
<if test="productType != null">
productType=#{productType},
</if>
<if test="productDirectoryCode != null">
productDirectoryCode=#{productDirectoryCode},
</if>
<if test="agentName != null">
agentName=#{agentName},
</if>
<if test="agentArea != null">
agentArea=#{agentArea},
</if>
<if test="agentAreaCode != null">
agentAreaCode=#{agentAreaCode},
</if>
<if test="agentAddress != null">
agentAddress=#{agentAddress},
</if>
<if test="instructions != null">
instructions=#{instructions},
</if>
<if test="productAddress != null">
productAddress=#{productAddress},
</if>
<if test="recordText != null">
recordText=#{recordText},
</if>
<if test="placeOrigin != null">
placeOrigin=#{placeOrigin},
</if>
<if test="productionRegion != null">
productionRegion=#{productionRegion},
</if>
<if test="productionCompanyName != null">
productionCompanyName=#{productionCompanyName},
</if>
<if test="afterSale != null">
afterSale=#{afterSale},
</if>
<if test="specification != null">
specification=#{specification},
</if>
<if test="structure != null">
structure=#{structure},
</if>
<if test="scope != null">
scope=#{scope},
</if>
<if test="other != null">
other=#{other},
</if>
<if test="filePath != null">
filePath=#{filePath},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="createTime != null">
createTime=#{createTime},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="manufacturerIdFk != null">
manufacturerIdFk=#{manufacturerIdFk},
</if>
<if test="customerId != null">
customerId=#{customerId},
</if>
<if test="productId != null">
productId=#{productId},
</if>
<if test="auditStatus != null">
auditStatus=#{auditStatus},
</if>
<if test="auditComment != null">
auditComment=#{auditComment},
</if>
<if test="sptm != null">
sptm=#{sptm},
</if>
<if test="ybbm != null">
ybbm=#{ybbm},
</if>
<if test="measname != null">
measname=#{measname},
</if>
<if test="cpms != null">
cpms=#{cpms},
</if>
<if test="hchzsb != null">
hchzsb=#{hchzsb},
</if>
<if test="relIdFk != null">
relIdFk=#{relIdFk},
</if>
</set>
WHERE id=#{id}
WHERE id = #{id}
</update>
<insert id="insertRegistration" parameterType="com.glxp.api.entity.purchase.SupProductEntity">
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})
</insert>
<delete id="deleteById" parameterType="Map">
@ -237,5 +326,4 @@
FROM sup_product
WHERE enterpriseId = #{enterpriseId}
</delete>
</mapper>

Write Preview
Loading…
Cancel
Save