From febdfeb2706c861cba37f54dcfd39a2c546f2389 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期三, 25 十月 2023 14:51:09 +0800 Subject: [PATCH] Changes --- mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java | 11 +++++------ 1 files changed, 5 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..532d7c0 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,7 +44,6 @@ 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.routing.RoutingStateMachineConfig; @@ -1264,11 +1263,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