From 18e377d51d098c1a27ced15e808ad148d34af7ad Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 06 十一月 2023 09:12:38 +0800
Subject: [PATCH] Changes
---
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
index 30fd0b6..a83cb8b 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
@@ -44,9 +44,9 @@
import com.chinaztt.mes.technology.entity.*;
import com.chinaztt.mes.technology.excel.RoutingData;
import com.chinaztt.mes.technology.excel.RoutingExcelData;
-import com.chinaztt.mes.technology.excel.StructureData;
import com.chinaztt.mes.technology.mapper.*;
import com.chinaztt.mes.technology.service.RoutingService;
+import com.chinaztt.mes.technology.state.bom.constant.BomStateStringValues;
import com.chinaztt.mes.technology.state.routing.RoutingStateMachineConfig;
import com.chinaztt.mes.technology.state.routing.constant.RoutingEvents;
import com.chinaztt.mes.technology.state.routing.constant.RoutingStateStringValues;
@@ -168,6 +168,10 @@
int noCount = baseMapper.selectCount(Wrappers.<Routing>lambdaQuery().eq(Routing::getRoutingNo, routingDTO.getRoutingNo()));
if (noCount > 0) {
throw new RuntimeException("缂栧彿閲嶅");
+ }
+ Bom bom = bomMapper.selectById(routingDTO.getBomId());
+ if(Objects.equals(BomStateStringValues.DRAFT,bom.getState())){
+ throw new RuntimeException("BOM鐘舵�佹湭閫氳繃锛�");
}
//涓昏〃涓�愰浂浠跺彿銆戙�併�愬伐鑹虹増鏈�戙�併�愭浛浠ｃ�戝�肩殑缁勫悎椤诲敮涓�銆�
noCount = baseMapper.selectCount(Wrappers.<Routing>lambdaQuery().eq(Routing::getPartId, routingDTO.getPartId())
@@ -1264,11 +1268,11 @@
//缁撴瀯绫诲瀷
batchinfoJsonObj.put("BOM_TYPE_DB", routingDTO.getBomTypeDb());
//鍚敤鏃堕棿
- batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate()));
- if (routingDTO.getPhaseOutDate() != null) {
- //寮冪敤鏃堕棿
- batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate()));
- }
+ //batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate()));
+ //if (routingDTO.getPhaseOutDate() != null) {
+ // //寮冪敤鏃堕棿
+ // batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate()));
+ //}
JSONArray alternateInfo = new JSONArray();
JSONObject alobj = new JSONObject()
.fluentPut("ALTERNATIVE_NO", routingDTO.getAlternativeNo())
--
Gitblit v1.9.3