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

高耗出库明细校验采购类型，高耗自动生成校验单据是否异常

Browse Source
dev_fifo1.0
anthonywj 1 year ago
parent 36a026f075
commit 40d97991e8
3 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java
Unescape Escape View File

@ -138,5 +138,5 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<BasicProductsEntity> selectProductByRelIds(@Param("relIds")List<Long> relIds); List<BasicProductsEntity> selectProductByRelIds(@Param("relIds")List<Long> relIds);
List<BasicProductsEntity> getProductsEntitiesByNameCode(String nameCode); List<UdiRelevanceResponse> getProductsEntitiesByNameCode(String nameCode);
} }

31
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -32,6 +33,7 @@ import com.glxp.api.req.thrsys.GenerateOrderRequest;
import com.glxp.api.req.thrsys.RefreshOrderRequest; import com.glxp.api.req.thrsys.RefreshOrderRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.MainIdRelIdAndProductResponse; import com.glxp.api.res.basic.MainIdRelIdAndProductResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inv.ThrInvResultResponse; import com.glxp.api.res.inv.ThrInvResultResponse;
import com.glxp.api.res.thrsys.ThrInvOrderResponse; import com.glxp.api.res.thrsys.ThrInvOrderResponse;
import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.CustomerService;
@ -213,7 +215,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
try { try {
thrInvOrder.setChargeTime(sdf2.parse(thrInvResultResponse.getChargeTime())); thrInvOrder.setChargeTime(sdf2.parse(thrInvResultResponse.getChargeTime()));
} catch (ParseException e) { } catch (ParseException e) {
log.error("第三方高耗收费明细下载--收费时间转化出错，原数据：【"+thrInvResultResponse.getChargeTime() + "】"); log.error("第三方高耗收费明细下载--收费时间转化出错，原数据：【" + thrInvResultResponse.getChargeTime() + "】");
} }
//保存数据 //保存数据
thrInvOrderMapper.insert(thrInvOrder); thrInvOrderMapper.insert(thrInvOrder);
@ -221,13 +223,13 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
//是否自动生成出入库单据 //是否自动生成出入库单据
if (IntUtil.value(systemParamConfigService.selectValueByParamKey("gh_out_auto_gen")) > 0) { if (IntUtil.value(systemParamConfigService.selectValueByParamKey("gh_out_auto_gen")) > 0) {
GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest(); if (StrUtil.isBlank(thrInvOrder.getExMsg())) {
generateOrderRequest.setBillNo(thrInvOrder.getBillNo()); GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest();
generateOrderRequest.setAction(thrInvOrder.getBillType()); generateOrderRequest.setBillNo(thrInvOrder.getBillNo());
generateOrderRequest.setAction(thrInvOrder.getBillType());
// generateOrderRequest.setFromCorp(thrInvOrder.getFromCorp()); // generateOrderRequest.setFromCorp(thrInvOrder.getFromCorp());
generateGhOrder(generateOrderRequest); generateGhOrder(generateOrderRequest);
}
} }
} }
@ -253,9 +255,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
String udiCode = item.getUdiCode(); String udiCode = item.getUdiCode();
UdiEntity udiEntity = FilterUdiUtils.getUdi(udiCode); UdiEntity udiEntity = FilterUdiUtils.getUdi(udiCode);
String nameCode = udiEntity.getUdi(); String nameCode = udiEntity.getUdi();
List<BasicProductsEntity> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); List<UdiRelevanceResponse> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode);
if (CollectionUtil.isNotEmpty(productsEntities)) { if (CollectionUtil.isNotEmpty(productsEntities)) {
BasicProductsEntity basicProductsEntity = productsEntities.get(0); UdiRelevanceResponse basicProductsEntity = productsEntities.get(0);
String mainAction = item.getMainAction(); String mainAction = item.getMainAction();
String thrCode = item.getThrCode(); String thrCode = item.getThrCode();
@ -277,6 +279,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId());
else else
exmsg.append(thrCode + "供应商未关联"); exmsg.append(thrCode + "供应商未关联");
if (IntUtil.value(basicProductsEntity.getPurType()) == 0) {
exmsg.append(thrCode + "采购类型未设置");
}
thrInvOrderDetail.setUdiCode(udiCode); thrInvOrderDetail.setUdiCode(udiCode);
thrInvOrderDetail.setThrCode(thrCode); thrInvOrderDetail.setThrCode(thrCode);
thrInvOrderDetail.setReCount(String.valueOf(count)); thrInvOrderDetail.setReCount(String.valueOf(count));
@ -762,9 +767,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
Long relId = item.getRelId(); Long relId = item.getRelId();
if (ObjectUtil.isNull(relId)) { if (ObjectUtil.isNull(relId)) {
String nameCode = item.getNameCode(); String nameCode = item.getNameCode();
List<BasicProductsEntity> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); List<UdiRelevanceResponse> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode);
if (CollectionUtil.isNotEmpty(productsEntities)) { if (CollectionUtil.isNotEmpty(productsEntities)) {
BasicProductsEntity basicProductsEntity = productsEntities.get(0); UdiRelevanceResponse basicProductsEntity = productsEntities.get(0);
item.setRelId(basicProductsEntity.getId()); item.setRelId(basicProductsEntity.getId());
updateThrInvOrderDetails.add(item); updateThrInvOrderDetails.add(item);
} else { } else {
@ -1193,9 +1198,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
Long relId = item.getRelId(); Long relId = item.getRelId();
if (ObjectUtil.isNull(relId)) { if (ObjectUtil.isNull(relId)) {
String nameCode = item.getNameCode(); String nameCode = item.getNameCode();
List<BasicProductsEntity> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); List<UdiRelevanceResponse> productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode);
if (CollectionUtil.isNotEmpty(productsEntities)) { if (CollectionUtil.isNotEmpty(productsEntities)) {
BasicProductsEntity basicProductsEntity = productsEntities.get(0); UdiRelevanceResponse basicProductsEntity = productsEntities.get(0);
item.setRelId(basicProductsEntity.getId()); item.setRelId(basicProductsEntity.getId());
item.setHandleStatus(1); item.setHandleStatus(1);
item.setToBillNo(newBillNo); item.setToBillNo(newBillNo);

124
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -1233,74 +1233,74 @@
<insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity"> <insert id="insertUdiRelevance" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
replace replace
INTO basic_udirel INTO basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock, isLock,
lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
updateTime, modifyTime, updateTime, modifyTime,
createUser, createUser,
updateUser, updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert) remark, useExpireTime, dispatch, groupBuy, needCert)
values (#{id}, values (#{id},
#{uuid}, #{uuid},
#{mainId}, #{mainId},
#{thirdId}, #{thirdId},
#{thirdId1}, #{thirdId1},
#{thirdId2}, #{thirdId2},
#{thirdId3}, #{thirdId3},
#{thirdId4}, #{thirdId4},
#{udplatCode}, #{udplatCode},
#{isUseDy}, #{isUseDy},
#{isDisable}, #{isDisable},
#{isLock}, #{isLock},
#{lockStatus}, #{lockStatus},
#{isAdavence}, #{purType}, #{attributeType}, #{hcType}, #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
#{useMuti}, #{useMuti},
#{useNum}, #{useNum},
#{supName}, #{supName},
#{createTime}, #{createTime},
#{updateTime}, #{updateTime},
#{modifyTime}, #{modifyTime},
#{createUser}, #{createUser},
#{updateUser}, #{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
</insert> </insert>
<insert id="insertUdiRelevanceignore" <insert id="insertUdiRelevanceignore"
parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity"> parameterType="com.glxp.api.entity.basic.UdiRelevanceEntity">
insert insert
ignore ignore
INTO basic_udirel INTO basic_udirel
(id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
isLock, isLock,
lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime,
updateTime, modifyTime, updateTime, modifyTime,
createUser, createUser,
updateUser, updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert) remark, useExpireTime, dispatch, groupBuy, needCert)
values (#{id}, values (#{id},
#{uuid}, #{uuid},
#{mainId}, #{mainId},
#{thirdId}, #{thirdId},
#{thirdId1}, #{thirdId1},
#{thirdId2}, #{thirdId2},
#{thirdId3}, #{thirdId3},
#{thirdId4}, #{thirdId4},
#{udplatCode}, #{udplatCode},
#{isUseDy}, #{isUseDy},
#{isDisable}, #{isDisable},
#{isLock}, #{isLock},
#{lockStatus}, #{lockStatus},
#{isAdavence}, #{purType}, #{attributeType}, #{hcType}, #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
#{useMuti}, #{useMuti},
#{useNum}, #{useNum},
#{supName}, #{supName},
#{createTime}, #{createTime},
#{updateTime}, #{updateTime},
#{modifyTime}, #{modifyTime},
#{createUser}, #{createUser},
#{updateUser}, #{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
</insert> </insert>
<delete id="deleteById" parameterType="Map"> <delete id="deleteById" parameterType="Map">
@ -1898,8 +1898,8 @@
</select> </select>
<select id="getProductsEntitiesByNameCode" resultType="com.glxp.api.entity.basic.BasicProductsEntity"> <select id="getProductsEntitiesByNameCode" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select bu.id, select bu.id,bu.purType,
basic_products.originUuid, basic_products.originUuid,
basic_products.nameCode, basic_products.nameCode,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,

Write Preview
Loading…
Cancel
Save