From ab5ba48b59bd4811e1df243b6f24e7cef1182fd6 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 四月 2026 16:18:20 +0800
Subject: [PATCH] 业务管理：外购订单更新批次属性报错目标已存在问题调整
---
inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java | 9 ++++++---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java
index 9565c99..f64b80d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/PushIfsPartPropsRecordAspect.java
+++ b/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");
//濡傛灉璁㈠崟鏄疜JNS鍩熺殑澶栬喘璁㈠崟锛屽厤妫�鏃跺悓姝TNS鍩熺殑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);
}
}
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 d30886e..0ebc8e9 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;
@@ -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
--
Gitblit v1.9.3