From c935e18fab3604e493de29b164ea4019244bb182 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 21 五月 2026 17:59:58 +0800
Subject: [PATCH] 对外Mes查询外购订单零件批次属性接口开发
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 0ebc8e9..d3c3072 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
@@ -20,6 +20,7 @@
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.stereotype.Service;
@@ -133,8 +134,8 @@
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());
+ 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());//澶栨姢棰滆壊
@@ -150,6 +151,29 @@
public IfsPartPropsRecordDTO getOneByContract(IfsInventoryQuantityDto ifsInventoryQuantityDto) {
return baseMapper.selectOneByContract(ifsInventoryQuantityDto);
}
+
+ @Override
+ public IfsPartPropsRecordDTO getIfsPartProps(IfsInventoryQuantityDto ifsPartPropsRecordDTO) {
+ validateParams(ifsPartPropsRecordDTO);
+ ifsPartPropsRecordDTO.setOrderType(OrderType.WG.getValue());
+ return baseMapper.selectOneByContract(ifsPartPropsRecordDTO);
+ }
+
+ void validateParams(IfsInventoryQuantityDto ifsPartPropsRecordDTO){
+ if(Objects.isNull(ifsPartPropsRecordDTO)){
+ throw new RuntimeException("浼犲叆鍙傛暟涓嶈兘涓虹┖");
+ }
+ if(StringUtils.isBlank(ifsPartPropsRecordDTO.getContract())){
+ throw new RuntimeException("宸ュ巶鍩熶笉鑳戒负绌�");
+ }
+ if(StringUtils.isBlank(ifsPartPropsRecordDTO.getUpdateBatchNo())){
+ throw new RuntimeException("鎵规鍙蜂笉鑳戒负绌�");
+ }
+ if(StringUtils.isBlank(ifsPartPropsRecordDTO.getPartNo())){
+ throw new RuntimeException("闆朵欢鍙蜂笉鑳戒负绌�");
+ }
+ }
+
}
--
Gitblit v1.9.3