松下工位节拍采集记录报表

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
  **/
 @RestController
 @Api(tags = "松下工位节拍PLC配置 控制层")
-@RequestMapping(CommonConstWords.BASE_URL_MES + "/sx/" + "/work-cell-takt-collect-plc-cfg")
+@RequestMapping(CommonConstWords.BASE_URL_MES + "/sx" + "/work-cell-takt-collect-plc-cfg")
 public class SxWorkCellTaktCollectPlcCfgController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SxWorkCellTaktCollectPlcCfgController.class);
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/SxWorkCelITaktCollectRecordReportController.java

@@ -49,7 +49,7 @@ public class SxWorkCelITaktCollectRecordReportController extends MesBaseControll
         }
     }
 
-    @PutMapping(value = "/work-cell-takt-collect-record/update-status-batch")
+    @PutMapping(value = "/work-cell-takt-collect-record/update-valid-batch")
     @ApiOperation(value = "批量禁用/启用状态", notes = "批量禁用/启用状态")
     public ResultBean updateSxWorkCellTaktCollectPlcCfgStatus(String[] ids, int status) {
         try {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi.jx;
 
 import cn.estsh.i3plus.ext.mes.api.busi.jx.ISxWorkCellTaktCollectRecordService;
-import cn.estsh.i3plus.ext.mes.pojo.bean.MesProcessTorqueManage;
 import cn.estsh.i3plus.ext.mes.pojo.bean.SxWorkCellTaktCollectRecord;
-import cn.estsh.i3plus.ext.mes.pojo.repository.SxWorkCellTaktCollectPlcCfgRepository;
 import cn.estsh.i3plus.ext.mes.pojo.repository.SxWorkCellTaktCollectRecordRepository;
 import cn.estsh.i3plus.ext.mes.pojo.sqlpack.MesExtHqlPack;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java

@@ -952,8 +952,8 @@ public class MesExtHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellTaktCollectRecord.getOrganizeCode(), workCellTaktCollectRecord.getIsValid());
         DdlPreparedPack.getStringLikerPack(workCellTaktCollectRecord.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(workCellTaktCollectRecord.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, packBean);
-        if (!StringUtils.isEmpty(workCellTaktCollectRecord.getModifyDateTimeStart()) || !StringUtils.isEmpty(workCellTaktCollectRecord.getModifyDateTimeEnd())) {
-            DdlPreparedPack.timeBuilder(workCellTaktCollectRecord.getModifyDateTimeStart(), workCellTaktCollectRecord.getModifyDateTimeEnd(), MesExtConstWords.MODIFY_DATE_TIME, packBean, true);
+        if (!StringUtils.isEmpty(workCellTaktCollectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(workCellTaktCollectRecord.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(workCellTaktCollectRecord.getCreateDateTimeStart(), workCellTaktCollectRecord.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
         }
         return packBean;
     }