From 2cf06285f64311722cbf79fd5635b16718635e5e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:16 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
index 0f8c327..924b9e3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
@@ -3,15 +3,14 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.api.MesApiUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.api.mes.MesApiUtils;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +36,16 @@
private final static String LOCATION_NO = "WG-02-001";//mes澶栬喘鍚堟牸搴撲綅
+ @Autowired
+ private NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;
+
+
+
@Before(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
@Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
public void doAfterReturning(JoinPoint joinPoint) {
Object[] args = joinPoint.getArgs();
+ log.info("鎵ц鍚屾瀹炴椂搴撳瓨鍒癕ES,鍙傛暟锛歿}",args);
if(Objects.nonNull(args) && args.length>0) {
IfsInventoryQuantity ifsInventoryQuantity = BeanUtil.toBean(args[0], IfsInventoryQuantity.class);
if(Objects.nonNull(ifsInventoryQuantity) && ifsInventoryQuantity.getIsSplitOrder()==1){
@@ -66,6 +71,9 @@
//浣跨敤鐩稿悓鐨勭郴缁熺紪鍙�
one.setSystemNo(quantityList.get(0).getSystemNo());
}
+ if(StringUtils.isBlank(one.getSystemNo())){
+ one.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT,IfsSplitOrderRecord.PREFIX,IfsSplitOrderRecord::getSystemNo));
+ }
//鍚屾MES瀹炴椂搴撳瓨
Map<String, Object> requestMap = new HashMap<>();
requestMap.put("partNo", one.getPartNo()); // 闆朵欢缂栧彿
@@ -87,11 +95,12 @@
String jsonStr = JSONUtil.toJsonStr(Collections.singletonList(requestMap));
log.info("鍚屾MES瀹炴椂搴撳瓨璇锋眰鍙傛暟-->{}",jsonStr);
- boolean b = mesApiUtils.batchAddStock(jsonStr);
+ boolean b = mesApiUtils.batchAddStock(ifsInventoryQuantity.getContract(),jsonStr);
//鍚屾鎴愬姛锛屾洿鏂板悓姝ョ姸鎬�
if(b){
ifsSplitOrderRecordService.update(null,Wrappers.<IfsSplitOrderRecord>lambdaUpdate()
.set(IfsSplitOrderRecord::getSyncStatus,1)
+ .set(IfsSplitOrderRecord::getSystemNo,one.getSystemNo())
.eq(IfsSplitOrderRecord::getId,one.getId()));
}
}
--
Gitblit v1.9.3