Browse Source

pms 功能优化

zhangcl 2 months ago
parent
commit
399da44f25

+ 1 - 1
yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -47,7 +47,7 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_INSPECT_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(137, "巡检工单巡检明细不存在");
     ErrorCode IOT_MAIN_WORK_ORDER_DETAILS_NOT_EXISTS = new ErrorCode(138, "保养工单详情不存在");
     ErrorCode IOT_MAIN_WORK_ORDER_BOM_NOT_EXISTS = new ErrorCode(138, "保养工单BOM不存在");
-    ErrorCode IOT_MAIN_WORK_ORDER_BOM_MATERIAL_NOT_EXISTS = new ErrorCode(139,"保养bom物料不存在");
+    ErrorCode IOT_MAIN_WORK_ORDER_BOM_MATERIAL_NOT_EXISTS = new ErrorCode(139,"bom物料不存在");
     ErrorCode IOT_MAINTENANCE_PLAN_NO_EXISTS = new ErrorCode(140,"维修计划不存在");
     ErrorCode IOT_MAIN_WORK_ORDER_NOT_EXISTS = new ErrorCode(141,"保养工单不存在");
     ErrorCode IOT_DEVICE_RUN_LOG_NOT_EXISTS = new ErrorCode(142, "设备运行数据记录 中间表不存在");

+ 1 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotsapstock/IotSapStockMapper.java

@@ -44,7 +44,7 @@ public interface IotSapStockMapper extends BaseMapperX<IotSapStockDO> {
                 .eqIfPresent(IotSapStockDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(IotSapStockDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotSapStockDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(IotSapStockDO::getId);
+                .orderByAsc(IotSapStockDO::getFactoryId).orderByAsc(IotSapStockDO::getStorageLocationId);
         if ("Y".equals(reqVO.getConfigFlag())) {
             query.gt(IotSapStockDO::getSafetyStock, 0);
         } else if ("N".equals(reqVO.getConfigFlag())) {