From 40d97991e82517fcaa55ab7aae00b72b1e791f4d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 18 Apr 2024 10:18:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E8=80=97=E5=87=BA=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=A0=A1=E9=AA=8C=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E9=AB=98=E8=80=97=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8D=95=E6=8D=AE=E6=98=AF=E5=90=A6=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/dao/basic/UdiRelevanceDao.java | 2 +- .../thrsys/impl/ThrInvOrderServiceImpl.java | 31 +++-- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 124 +++++++++--------- 3 files changed, 81 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 8e965f24d..afedfe25e 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -138,5 +138,5 @@ public interface UdiRelevanceDao extends BaseMapperPlus selectProductByRelIds(@Param("relIds")List relIds); - List getProductsEntitiesByNameCode(String nameCode); + List getProductsEntitiesByNameCode(String nameCode); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index d0e83de7c..94ce82cdd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; 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.QueryWrapper; 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.res.PageSimpleResponse; 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.thrsys.ThrInvOrderResponse; import com.glxp.api.service.auth.CustomerService; @@ -213,7 +215,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { try { thrInvOrder.setChargeTime(sdf2.parse(thrInvResultResponse.getChargeTime())); } catch (ParseException e) { - log.error("第三方高耗收费明细下载--收费时间转化出错，原数据：【"+thrInvResultResponse.getChargeTime() + "】"); + log.error("第三方高耗收费明细下载--收费时间转化出错，原数据：【" + thrInvResultResponse.getChargeTime() + "】"); } //保存数据 thrInvOrderMapper.insert(thrInvOrder); @@ -221,13 +223,13 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { //是否自动生成出入库单据 if (IntUtil.value(systemParamConfigService.selectValueByParamKey("gh_out_auto_gen")) > 0) { - GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest(); - generateOrderRequest.setBillNo(thrInvOrder.getBillNo()); - generateOrderRequest.setAction(thrInvOrder.getBillType()); + if (StrUtil.isBlank(thrInvOrder.getExMsg())) { + GenerateOrderRequest generateOrderRequest = new GenerateOrderRequest(); + generateOrderRequest.setBillNo(thrInvOrder.getBillNo()); + generateOrderRequest.setAction(thrInvOrder.getBillType()); // generateOrderRequest.setFromCorp(thrInvOrder.getFromCorp()); - generateGhOrder(generateOrderRequest); - - + generateGhOrder(generateOrderRequest); + } } } @@ -253,9 +255,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { String udiCode = item.getUdiCode(); UdiEntity udiEntity = FilterUdiUtils.getUdi(udiCode); String nameCode = udiEntity.getUdi(); - List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); + List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); if (CollectionUtil.isNotEmpty(productsEntities)) { - BasicProductsEntity basicProductsEntity = productsEntities.get(0); + UdiRelevanceResponse basicProductsEntity = productsEntities.get(0); String mainAction = item.getMainAction(); String thrCode = item.getThrCode(); @@ -277,6 +279,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId()); else exmsg.append(thrCode + "供应商未关联"); + if (IntUtil.value(basicProductsEntity.getPurType()) == 0) { + exmsg.append(thrCode + "采购类型未设置"); + } thrInvOrderDetail.setUdiCode(udiCode); thrInvOrderDetail.setThrCode(thrCode); thrInvOrderDetail.setReCount(String.valueOf(count)); @@ -762,9 +767,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { Long relId = item.getRelId(); if (ObjectUtil.isNull(relId)) { String nameCode = item.getNameCode(); - List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); + List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); if (CollectionUtil.isNotEmpty(productsEntities)) { - BasicProductsEntity basicProductsEntity = productsEntities.get(0); + UdiRelevanceResponse basicProductsEntity = productsEntities.get(0); item.setRelId(basicProductsEntity.getId()); updateThrInvOrderDetails.add(item); } else { @@ -1193,9 +1198,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { Long relId = item.getRelId(); if (ObjectUtil.isNull(relId)) { String nameCode = item.getNameCode(); - List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); + List productsEntities = udiRelevanceDao.getProductsEntitiesByNameCode(nameCode); if (CollectionUtil.isNotEmpty(productsEntities)) { - BasicProductsEntity basicProductsEntity = productsEntities.get(0); + UdiRelevanceResponse basicProductsEntity = productsEntities.get(0); item.setRelId(basicProductsEntity.getId()); item.setHandleStatus(1); item.setToBillNo(newBillNo); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 558bc1ee8..9d74bc0b0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1233,74 +1233,74 @@ replace - INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, - updateTime, modifyTime, - createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + INTO basic_udirel + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, + updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) insert - ignore + ignore INTO basic_udirel - (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, - isLock, - lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, - updateTime, modifyTime, - createUser, - updateUser, - remark, useExpireTime, dispatch, groupBuy, needCert) + (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, + isLock, + lockStatus, isAdavence, purType, attributeType, hcType, useMuti, useNum, supName, createTime, + updateTime, modifyTime, + createUser, + updateUser, + remark, useExpireTime, dispatch, groupBuy, needCert) values (#{id}, - #{uuid}, - #{mainId}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, - #{udplatCode}, - #{isUseDy}, - #{isDisable}, - #{isLock}, - #{lockStatus}, - #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, - #{useMuti}, - #{useNum}, - #{supName}, - #{createTime}, - #{updateTime}, - #{modifyTime}, - #{createUser}, - #{updateUser}, - #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) + #{uuid}, + #{mainId}, + #{thirdId}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{udplatCode}, + #{isUseDy}, + #{isDisable}, + #{isLock}, + #{lockStatus}, + #{isAdavence}, #{purType}, #{attributeType}, #{hcType}, + #{useMuti}, + #{useNum}, + #{supName}, + #{createTime}, + #{updateTime}, + #{modifyTime}, + #{createUser}, + #{updateUser}, + #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}) @@ -1898,8 +1898,8 @@ - + select bu.id,bu.purType, basic_products.originUuid, basic_products.nameCode, basic_products.deviceRecordKey,