From ce1b2967ffe3e33a929f7c537de8a374c789e3ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 15:15:26 +0800
Subject: [PATCH] ifs批次属性更新：修复接口报错
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java
index 97c3271..c51ed06 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java
+++ b/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;
@@ -16,12 +20,14 @@
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsPartPropsRecordService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -42,6 +48,9 @@
@Autowired
private IfsSplitOrderRecordMapper ifsSplitOrderRecordMapper;
+
+ @Autowired
+ private IfsPartPropsRecordMapper ifsPartPropsRecordMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -78,6 +87,7 @@
@Override
+ @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
public IfsPartPropsRecord getOneByIfsId(Long ifsId) {
//鏌ヨifs璁㈠崟淇℃伅
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsId);
@@ -104,11 +114,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 = ObjectUtils.isNotEmpty(parseObject.get("ATTR2"))?new BigDecimal(parseObject.get("ATTR2").toString()):BigDecimal.ZERO;
+ BigDecimal endMeterMark = ObjectUtils.isNotEmpty(parseObject.get("ATTR3"))?new BigDecimal(parseObject.get("ATTR3").toString()):BigDecimal.ZERO;
+ 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
--
Gitblit v1.9.3