业务管理：外购订单更新批次属性报错目标已存在问题调整

zouyu

2026-04-29 ab5ba48b59bd4811e1df243b6f24e7cef1182fd6

业务管理：外购订单更新批次属性报错目标已存在问题调整

 inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java

@@ -50,7 +50,7 @@
        if(Objects.nonNull(args) && args.length>0) {
            Long ifsInventoryId = (Long)args[0];
            IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
            //查询ifs批次属性记录，有则不执行操作
            //查询ifs批次属性记录，有则更新没有则新增
            Map<String, Object> queryMap = new HashMap<>();
            queryMap.put("LOT_BATCH_NO",ifsInventoryQuantity.getUpdateBatchNo());
            queryMap.put("PART_NO",ifsInventoryQuantity.getPartNo());
@@ -59,7 +59,7 @@
                JSONObject entries = JSONUtil.parseObj(queryPartLotResult.getData());
                JSONArray listInfo = entries.getJSONArray("LIST_INFO");
                //如果订单是KJNS域的外购订单，免检时同步ZTNS域的IFS批次属性
                if(StringUtils.equals(ContractType.KJNS.getValue(),ifsInventoryQuantity.getContract()) && StringUtils.equals(OrderType.WG.getValue(),ifsInventoryQuantity.getOrderType()) && listInfo.isEmpty()){
                if(StringUtils.equals(ContractType.KJNS.getValue(),ifsInventoryQuantity.getContract()) && StringUtils.equals(OrderType.WG.getValue(),ifsInventoryQuantity.getOrderType())){
                    //查询ZTNS域的相同批次订单消息
                    IfsInventoryQuantityDto ifsInventoryQuantityDto = new IfsInventoryQuantityDto();
                    BeanUtil.copyProperties(ifsInventoryQuantity,ifsInventoryQuantityDto);
@@ -68,7 +68,7 @@
                    if(Objects.nonNull(oneByContract)){
                        //更新IFS批次属性
                        Map<String, Object> inAttrMap = new HashMap<>();
                        String actionType = "New";
                        String actionType = listInfo.isEmpty()?"New":"Modify";
                        inAttrMap.put("RECORD_ID", UUID.randomUUID().toString());
                        inAttrMap.put("SYSCODE", "LIMS");
                        inAttrMap.put("SYSMODEL", "库存物料批次属性修改");
@@ -90,7 +90,10 @@
                        if(result.getCode()!=200){
                            throw new RuntimeException("库存物料批次属性更新失败："+result.getMessage());
                        }
                        log.info("KJNS域外购订单免检同步库存物料批次属性到IFS->{}", result);
                    }
                    oneByContract.setId(null);
                    oneByContract.setIfsInventoryId(ifsInventoryId);
                    ifsPartPropsRecordService.save(oneByContract);
                }
            }

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java

@@ -1,6 +1,10 @@
package com.ruoyi.inspect.service.impl;

import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
@@ -19,8 +23,10 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.*;

/**
@@ -41,6 +47,9 @@

    @Autowired
    private IfsSplitOrderRecordMapper ifsSplitOrderRecordMapper;

    @Autowired
    private IfsPartPropsRecordMapper ifsPartPropsRecordMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -77,6 +86,7 @@


    @Override
    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
    public IfsPartPropsRecord getOneByIfsId(Long ifsId) {
        //查询ifs订单信息
        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsId);
@@ -103,11 +113,37 @@
            ifsPartPropsRecord.setLetteringInfo(splitRecord.getLetteringInfo());
            ifsPartPropsRecord.setInsulationColor(splitRecord.getInsulationColor());
            ifsPartPropsRecord.setOuterColor(splitRecord.getOuterColor());
            ifsPartPropsRecord.setDrumNo(splitRecord.getDrumNo());
            ifsPartPropsRecord.setDrumNo(splitRecord.getDrumNo());
            return ifsPartPropsRecord;
        }
        return this.getOne(Wrappers.<IfsPartPropsRecord>lambdaQuery().eq(IfsPartPropsRecord::getIfsInventoryId,ifsId).last("limit 1"));
        //查询批次属性记录
        IfsPartPropsRecord propsRecord = this.getOne(Wrappers.<IfsPartPropsRecord>lambdaQuery().eq(IfsPartPropsRecord::getIfsInventoryId, ifsId).last("limit 1"));
        if(ObjectUtil.isNotEmpty(propsRecord)){
            return propsRecord;
        }
        //查询ifs批次属性记录，有就先新增到数据库
        Map<String, Object> queryMap = new HashMap<>();
        queryMap.put("LOT_BATCH_NO",ifsInventoryQuantity.getUpdateBatchNo());
        queryMap.put("PART_NO",ifsInventoryQuantity.getPartNo());
        Result queryPartLotResult = ifsApiUtils.queryPartLotAttr(ifsInventoryQuantity.getContract(), JSONUtil.toJsonStr(queryMap));
        if(queryPartLotResult.getCode()==200){
            JSONObject entries = JSONUtil.parseObj(queryPartLotResult.getData());
            JSONArray listInfo = entries.getJSONArray("LIST_INFO");
            if(!listInfo.isEmpty()){
                Map<String,Object> parseObject = com.alibaba.fastjson2.JSONObject.parseObject(JSONUtil.toJsonStr(listInfo.get(0)), new TypeReference<Map<String, Object>>() {}.getType());
                IfsPartPropsRecord ifsPartPropsRecord = new IfsPartPropsRecord();
                ifsPartPropsRecord.setIfsInventoryId(ifsInventoryQuantity.getId());//ifs订单id
                ifsPartPropsRecord.setDrumNo(parseObject.get("ATTR1").toString());//载具编号
                BigDecimal startMeterMark = new BigDecimal(parseObject.get("ATTR2").toString());
                BigDecimal endMeterMark = new BigDecimal(parseObject.get("ATTR3").toString());
                ifsPartPropsRecord.setStartMeterMark(startMeterMark);//起始米标
                ifsPartPropsRecord.setEndMeterMark(endMeterMark);//截止米标
                ifsPartPropsRecord.setOuterColor(parseObject.get("ATTR4").toString());//外护颜色
                ifsPartPropsRecord.setInsulationColor(parseObject.get("ATTR5").toString());//绝缘颜色
                ifsPartPropsRecord.setLetteringInfo(parseObject.get("ATTR8").toString());//印字信息
                ifsPartPropsRecordMapper.insert(ifsPartPropsRecord);
            }
        }
        return this.getOne(Wrappers.<IfsPartPropsRecord>lambdaQuery().eq(IfsPartPropsRecord::getIfsInventoryId, ifsId).last("limit 1"));
    }

    @Override