From 1d9f79e7853d8d9b51c35817a5466db5a1a0b7e3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 17 十二月 2025 09:55:43 +0800
Subject: [PATCH] 订单拆分生成系统编号逻辑调整3
---
inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 d6ee1d0..c0dcab8 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
@@ -4,22 +4,20 @@
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
+import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.api.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;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
/**
* 鎵цifs绉诲簱鎿嶄綔鍚庯紝鍚屾鎺ㄩ�乵es瀹炴椂搴撳瓨
@@ -37,7 +35,10 @@
private final static String LOCATION_NO = "WG-02-001";//mes澶栬喘鍚堟牸搴撲綅
- @AfterReturning(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
+ @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();
@@ -55,12 +56,28 @@
.last("limit 1")
);
if(Objects.nonNull(one)){
+ //鏌ヨ瀵瑰簲璁板綍鐩稿悓鎵瑰彿鍜岄浂浠朵笖宸插悓姝ョ殑璁㈠崟璁板綍
+ List<IfsSplitOrderRecord> quantityList = ifsSplitOrderRecordService.list(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
+ .eq(IfsSplitOrderRecord::getPartNo,one.getPartNo())
+ .eq(IfsSplitOrderRecord::getLotBatchNo,one.getLotBatchNo())
+ .ne(IfsSplitOrderRecord::getId,one.getId())
+ .eq(IfsSplitOrderRecord::getSyncStatus,1)
+ );
+ if(!quantityList.isEmpty()){
+ //浣跨敤鐩稿悓鐨勭郴缁熺紪鍙�
+ one.setSystemNo(quantityList.get(0).getSystemNo());
+ }
+ if(Objects.isNull(one.getSystemNo())){
+ one.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT,IfsSplitOrderRecord.PREFIX,IfsSplitOrderRecord::getSystemNo));
+ }
//鍚屾MES瀹炴椂搴撳瓨
Map<String, Object> requestMap = new HashMap<>();
requestMap.put("partNo", one.getPartNo()); // 闆朵欢缂栧彿
requestMap.put("systemNo", one.getSystemNo()); // 绯荤粺缂栧彿
+ requestMap.put("newSystemNo", one.getSystemNo()); // 鏂扮郴缁熺紪鍙�
requestMap.put("spec", one.getSpec()); // 瑙勬牸
requestMap.put("partBatchNo", one.getLotBatchNo()); // 闆朵欢鎵瑰彿
+ requestMap.put("newPartBatchNo", one.getLotBatchNo()); // 鏂伴浂浠舵壒鍙�
requestMap.put("stockQuantity", one.getLength()); // 搴撳瓨鏁伴噺1
requestMap.put("qty", one.getQtyStock()); // 搴撳瓨鏁伴噺2
requestMap.put("insulationColor", one.getInsulationColor()); // 缁濈紭棰滆壊
@@ -73,11 +90,13 @@
requestMap.put("remark", one.getRemark()); // 澶囨敞
String jsonStr = JSONUtil.toJsonStr(Collections.singletonList(requestMap));
+ log.info("鍚屾MES瀹炴椂搴撳瓨璇锋眰鍙傛暟-->{}",jsonStr);
boolean b = mesApiUtils.batchAddStock(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