feat: 单据下载-器械

src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusTypeConstant;
 import com.glxp.api.dao.basic.BasicProductsDao;
 import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
@@ -145,6 +146,18 @@ public class IoCollectOriginService {
                 for (IoCollectOrderBizOrigin entity : list) {
                     IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
                     BeanUtil.copyProperties(entity, collectOrderBiz);
+
+                    if (BusTypeConstant.QXCF001.getBusType().equals(collectOrderRequest.getBusType())){
+                        collectOrderBiz.setRelId(entity.getRelId());
+                        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1"));
+                        if (StrUtil.isEmpty(basicProductsEntity.getNameCode())) {
+                            errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
+                        }
+                        collectOrderBiz.setTagStatus(1);
+                        collectOrderBiz.setUnTagCount(0);
+                        bizList.add(collectOrderBiz);
+
+                    }else {
                         UdiRelevanceEntity basicUdirelEntity = udiRelevanceDao.selectOne(new LambdaQueryWrapper<UdiRelevanceEntity>().eq(UdiRelevanceEntity::getMainId, entity.getThrCode()));
                         if (basicUdirelEntity != null) {
                             collectOrderBiz.setRelId(basicUdirelEntity.getId());
@@ -159,6 +172,7 @@ public class IoCollectOriginService {
                         collectOrderBiz.setUnTagCount(0);
                         bizList.add(collectOrderBiz);
                     }
+                }
                 if (StrUtil.isNotEmpty(errorMsg)) {
                     thrOrder.setTagStatus(4);
                     thrOrder.setErrorMsg(errorMsg.toString());

src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusTypeConstant;
 import com.glxp.api.dao.basic.BasicProductsDao;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.BasicProductsEntity;
@@ -102,6 +103,18 @@ public class ThrOrderDownload implements IDownload {
                 for (IoCollectOrderBiz entity : thrOrder.getBizList()) {
                     IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
                     BeanUtil.copyProperties(entity, collectOrderBiz);
+
+                    if (BusTypeConstant.QXCF001.getBusType().equals(collectOrderRequest.getBusType())){
+                        collectOrderBiz.setRelId(entity.getRelId());
+                        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1"));
+                        if (StrUtil.isEmpty(basicProductsEntity.getNameCode())) {
+                            errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
+                        }
+                        collectOrderBiz.setTagStatus(1);
+                        collectOrderBiz.setUnTagCount(0);
+                        bizList.add(collectOrderBiz);
+
+                    }else {
                         UdiRelevanceEntity basicUdirelEntity = udiRelevanceDao.selectOne(new LambdaQueryWrapper<UdiRelevanceEntity>().eq(UdiRelevanceEntity::getMainId, entity.getThrCode()).last("limit 1"));
                         if (basicUdirelEntity != null) {
                             collectOrderBiz.setRelId(basicUdirelEntity.getId());
@@ -116,6 +129,8 @@ public class ThrOrderDownload implements IDownload {
                         collectOrderBiz.setUnTagCount(0);
                         bizList.add(collectOrderBiz);
                     }
+                }
+
                 if (StrUtil.isNotBlank(errorMsg)) {
                     ioCollectOrder.setTagStatus(4);
                 } else