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/service/impl/IfsPartPropsRecordServiceImpl.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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 bc4f41f..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,24 +1,32 @@
package com.ruoyi.inspect.service.impl;
-import cn.hutool.core.bean.BeanUtil;
+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;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.enums.OrderType;
import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.inspect.dto.IfsPartPropsRecordDTO;
+import com.ruoyi.inspect.mapper.IfsPartPropsRecordMapper;
import com.ruoyi.inspect.mapper.IfsSplitOrderRecordMapper;
import com.ruoyi.inspect.pojo.IfsPartPropsRecord;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsPartPropsRecordService;
-import com.ruoyi.inspect.mapper.IfsPartPropsRecordMapper;
import lombok.extern.slf4j.Slf4j;
+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.*;
/**
@@ -40,6 +48,9 @@
@Autowired
private IfsSplitOrderRecordMapper ifsSplitOrderRecordMapper;
+ @Autowired
+ private IfsPartPropsRecordMapper ifsPartPropsRecordMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateProps(IfsPartPropsRecordDTO ifsPartPropsRecord) {
@@ -53,25 +64,29 @@
inAttrMap.put("SYSCODE", "LIMS");
inAttrMap.put("SYSMODEL", "搴撳瓨鐗╂枡鎵规灞炴�т慨鏀�");
HashMap<String, Object> batchInfoMap = new HashMap<>();
- batchInfoMap.put("CONTRACT","ZTNS");//鍩�
+ batchInfoMap.put("CONTRACT",ifsPartPropsRecord.getContract());//鍩�
batchInfoMap.put("PART_NO",ifsPartPropsRecord.getPartNo());//闆朵欢鍙�
batchInfoMap.put("LOT_BATCH_NO",ifsPartPropsRecord.getLotBatchNo());//鎵规鍙�
batchInfoMap.put("ATTR1",ifsPartPropsRecord.getDrumNo());//杞藉叿缂栧彿
- batchInfoMap.put("ATTR2",ifsPartPropsRecord.getStartMeterMark());//璧峰绫虫爣
- batchInfoMap.put("ATTR3",ifsPartPropsRecord.getEndMeterMark());//鎴绫虫爣
- batchInfoMap.put("ATTR4", ifsPartPropsRecord.getInsulationColor());//缁濈紭棰滆壊
- batchInfoMap.put("ATTR5",ifsPartPropsRecord.getOuterColor());//澶栨姢棰滆壊
+ batchInfoMap.put("ATTR2",ifsPartPropsRecord.getStartMeterMark().toString());//璧峰绫虫爣
+ batchInfoMap.put("ATTR3",ifsPartPropsRecord.getEndMeterMark().toString());//鎴绫虫爣
+ batchInfoMap.put("ATTR4", ifsPartPropsRecord.getOuterColor());//澶栨姢棰滆壊
+ batchInfoMap.put("ATTR5",ifsPartPropsRecord.getInsulationColor());//缁濈紭棰滆壊
batchInfoMap.put("ATTR8",ifsPartPropsRecord.getLetteringInfo());//鍗板瓧淇℃伅
+ batchInfoMap.put("ATTR23","杞﹂棿璁㈠崟");//鍏ュ簱鏉ユ簮
+ batchInfoMap.put("ATTR24","0");//鍒嗗壊棰勭暀鏁伴噺
batchInfoMap.put("ACTION_TYPE",actionType);//鎿嶄綔绫诲瀷
inAttrMap.put("BATCH_INFO", Collections.singletonList(batchInfoMap));
- Result result = ifsApiUtils.importPartLotAttr(JSONUtil.toJsonStr(inAttrMap));
+ Result result = ifsApiUtils.importPartLotAttr(ifsPartPropsRecord.getContract(),JSONUtil.toJsonStr(inAttrMap));
if(result.getCode()!=200){
throw new RuntimeException("搴撳瓨鐗╂枡鎵规灞炴�ф洿鏂板け璐ワ細"+result.getMessage());
}
return this.saveOrUpdate(ifsPartPropsRecord);
}
+
@Override
+ @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
public IfsPartPropsRecord getOneByIfsId(Long ifsId) {
//鏌ヨifs璁㈠崟淇℃伅
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsId);
@@ -79,7 +94,7 @@
throw new RuntimeException("鏈壘鍒板搴旂殑IFS璁㈠崟淇℃伅");
}
//鍒ゆ柇鏄惁鏄媶鍒嗚鍗�
- if(ifsInventoryQuantity.getIsSplitOrder().equals(1)){
+ if(ifsInventoryQuantity.getIsSplitOrder().equals(1)&& StringUtils.equals(ifsInventoryQuantity.getOrderType(), OrderType.RAW.getValue())){
//鏌ヨ鎷嗗垎璁板綍
IfsSplitOrderRecord splitRecord = ifsSplitOrderRecordMapper.selectOne(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
.eq(IfsSplitOrderRecord::getOrderNo, ifsInventoryQuantity.getOrderNo())
@@ -98,11 +113,42 @@
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
+ public IfsPartPropsRecordDTO getOneByContract(IfsInventoryQuantityDto ifsInventoryQuantityDto) {
+ return baseMapper.selectOneByContract(ifsInventoryQuantityDto);
}
}
--
Gitblit v1.9.3