From c17a0d27b6a2e9e0ebda4ee584b6b2fdf4e323ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 05 十一月 2025 12:46:14 +0800
Subject: [PATCH] 数采调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..89fb4c2 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
@@ -7,6 +7,7 @@
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.IfsSplitOrderRecordMapper;
@@ -15,6 +16,7 @@
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.Transactional;
@@ -57,11 +59,13 @@
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));
@@ -79,7 +83,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())
--
Gitblit v1.9.3