diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index a614c1ca..2bfbb976 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -120,7 +120,7 @@ public class MaterialController { List list = new ArrayList<>(); Integer total = 0; - Integer size = 10, page = 1; // 定义每页展示数量 + Integer size = 15, page = 1; // 定义每页展示数量 if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java index dc39684e..b147477b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java @@ -112,7 +112,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService { */ @Override public List findBusinessTypeByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java index 206208d3..70958de8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java @@ -51,7 +51,7 @@ public class ConstructionUnitServiceImpl implements ConstructionUnitService { */ @Override public List findConstructionUnitByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 79fe9e79..28d82bf5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -4754,7 +4754,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override public List findApplicationInRecordPByCondition(Map map, UserByPort userToken, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -4820,7 +4820,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override public List findApplicationInRecordPByUser(UserByPort userByPort, Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -4998,7 +4998,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override public List findApplicationOutRecordPByCondition(Map map, UserByPort userToken, String userKey, String token) { - Integer size = 10, page = 1; + + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -5122,7 +5123,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override public List findMyTaskOut(Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -5143,7 +5144,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override public List findMyTaskIn(Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index 62395ac0..3576825f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -133,7 +133,7 @@ public class DepositoryServiceImpl implements DepositoryService { */ @Override public List findDepositoryByCondition(Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 7576fdcd..23f875e0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -227,7 +227,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findMaterialPByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -307,7 +307,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findInventory(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -361,7 +361,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findMaterial(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -505,7 +505,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findInventoryByMidAndDidList(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -1021,7 +1021,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findInventoryByDepository(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -2708,7 +2708,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List findInventoryForStockTaking(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java index 33c7d3dc..5171cb03 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java @@ -85,7 +85,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService { */ @Override public List findMaterialTypeByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java index 9a4a7e97..5101dcf6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java @@ -62,7 +62,7 @@ public class NoticeServiceImpl implements NoticeService { @Override public List findNoticeByCondition(Map map, UserByPort userByPort,String userKey,String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -123,7 +123,7 @@ public class NoticeServiceImpl implements NoticeService { */ @Override public List findAllNoticeForUser(Map map, UserByPort userByPort,String userKey,String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java index ced39889..dc06586b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java @@ -60,7 +60,7 @@ public class PlaceServiceImpl implements PlaceService { map.put("z", map.get("place_z")); map.remove("place_z"); } - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -89,7 +89,7 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public Integer findPlaceCountByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -308,7 +308,7 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public List findPlaceAndMaterialByDidsAndMid(List dids, Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java index 8c8f8316..4fbb0d87 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java @@ -127,7 +127,7 @@ public class RoleServiceImpl implements RoleService { */ @Override public List findRoleAndDepositoryByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -147,7 +147,7 @@ public class RoleServiceImpl implements RoleService { */ @Override public List findRoleAndMaterialTypeByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java index 4585b54a..354f9e04 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java @@ -918,7 +918,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { */ @Override public List findSplitInfoPByCondition(Map map) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index 8e85c3ea..f9ff0fcc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java @@ -239,7 +239,7 @@ public class StockTakingServiceImpl implements StockTakingService { */ @Override public List findMyTask(Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); @@ -282,7 +282,7 @@ public class StockTakingServiceImpl implements StockTakingService { */ @Override public List findMyApply(Map map, String userKey, String token) { - Integer size = 10, page = 1; + Integer size = 15, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 3ff1293c..21c09366 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -180,18 +180,9 @@ {field: "code", title: '申请编码', width: 150,}, {field: 'mname', width: 150, title: '物料名称'}, {field: 'mcode', width: 150, title: '存货编码'}, - {field: 'quantity', width: 150, title: '数量', sort: true}, + {field: 'quantity', width: 100, title: '数量', sort: true}, {field: 'depositoryName', width: 150, title: '仓库名称'}, {field: 'state', width: 150, title: '流程状态'}, - { - field: 'pass', title: '是否完成出库', minWidth: 120, templet: function (d) { - if (d.pass === 1) { - return "是"; - } else { - return "否"; - } - } - }, {field: 'applicantName', width: 150, title: '申请人'}, {field: 'adminorgName', width: 150, title: '申请人部门'}, {field: 'useAdminorgName', width: 150, title: '使用部门'}, @@ -255,21 +246,12 @@ cols: [ [ {type: "checkbox", width: 50}, - {title: '申请编码', width: 150, templet: '#applicationOutCode'}, + {field: "code", title: '申请编码', width: 150,}, {field: 'mname', width: 150, title: '物料名称'}, {field: 'mcode', width: 150, title: '存货编码'}, - {field: 'quantity', width: 150, title: '数量', sort: true}, + {field: 'quantity', width: 100, title: '数量', sort: true}, {field: 'depositoryName', width: 150, title: '仓库名称'}, {field: 'state', width: 150, title: '流程状态'}, - { - field: 'pass', title: '是否完成出库', minWidth: 120, templet: function (d) { - if (d.pass === 1) { - return "是"; - } else { - return "否"; - } - } - }, {field: 'applicantName', width: 150, title: '申请人'}, {field: 'applicantTime', width: 200, title: '申请时间', sort: true}, {