Changes

Fixiaobai

2023-10-25 febdfeb2706c861cba37f54dcfd39a2c546f2389

 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())