diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java index ec21503..11303fc 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java @@ -48,7 +48,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl page (Map params){ IPage page = baseDao.selectPage( - getPage(params, WoCompensationPower.ID, true), + getPage(params, WoCompensationPower.CREATE_TIME, false), getWrapper(params) ); return getPageData(page, WoCompensationPowerDTO.class); diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index 5571455..02bdf31 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -142,6 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo()); + wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME); List woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper); dto.setSubstrateList(woPackagingBoxSubstrateList); return dto; diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java index 2907860..220235f 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java @@ -58,7 +58,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl page (Map params){ IPage page = baseDao.selectPage( - getPage(params, WoPackagingBoxSubstrate.SLOT, true), + getPage(params, WoPackagingBoxSubstrate.CREATE_TIME, false), getWrapper(params) ); return getPageData(page, WoPackagingBoxSubstrateDTO.class); diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java index 8f81ca9..4aadef9 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java @@ -48,7 +48,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl page (Map params){ IPage page = baseDao.selectPage( - getPage(params, WoPowerLevel.ID, true), + getPage(params, WoPowerLevel.CREATE_TIME, false), getWrapper(params) ); return getPageData(page, WoPowerLevelDTO.class);