From c2ba0dd8a4ef0d9d77e432e76e3e2eef16d19bed Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 5 Dec 2023 15:16:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=E5=B7=A5=E4=BD=8D=E8=8A=82?= =?UTF-8?q?=E6=8B=8D=E9=87=87=E9=9B=86=E8=AE=B0=E5=BD=95=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java | 2 +- .../busi/jx/SxWorkCelITaktCollectRecordReportController.java | 2 +- .../serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java | 2 -- .../main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java index f5c2d00..8f1445f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/SxWorkCellTaktCollectPlcCfgController.java +++ b/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); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/SxWorkCelITaktCollectRecordReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/SxWorkCelITaktCollectRecordReportController.java index e5e1306..e4638d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/jx/SxWorkCelITaktCollectRecordReportController.java +++ b/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 { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java index 0948f58..85ccafe 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/SxWorkCellTaktCollectRecordService.java +++ b/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; diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java index 1fdd18a..a881143 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java +++ b/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; }