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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 2595c51..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
@@ -6,7 +6,7 @@
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.api.MesApiUtils;
+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;
@@ -39,10 +39,13 @@
@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){
@@ -92,7 +95,7 @@
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()
--
Gitblit v1.9.3