修改分页查询为15条每行

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -120,7 +120,7 @@ public class MaterialController {
 
         List<InventoryP> 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"));
         }

src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java

@@ -112,7 +112,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService {
      */
     @Override
     public List<BusinessType> findBusinessTypeByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java

@@ -51,7 +51,7 @@ public class ConstructionUnitServiceImpl implements ConstructionUnitService {
      */
     @Override
     public List<ConstructionUnit> findConstructionUnitByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -4754,7 +4754,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
      */
     @Override
     public List<ApplicationInRecordP> findApplicationInRecordPByCondition(Map<String, Object> 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<ApplicationInRecordP> findApplicationInRecordPByUser(UserByPort userByPort, Map<String, Object> 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<ApplicationOutRecordP> findApplicationOutRecordPByCondition(Map<String, Object> 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<SimpleApplicationOutOrInRecordP> findMyTaskOut(Map<String, Object> 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<SimpleApplicationOutOrInRecordP> findMyTaskIn(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@@ -133,7 +133,7 @@ public class DepositoryServiceImpl implements DepositoryService {
      */
     @Override
     public List<Depository> findDepositoryByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@@ -227,7 +227,7 @@ public class MaterialServiceImpl implements MaterialService {
      */
     @Override
     public List<MaterialP> findMaterialPByCondition(Map<String, Object> 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<InventoryP> findInventory(Map<String, Object> 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<MaterialP> findMaterial(Map<String, Object> 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<Inventory> findInventoryByMidAndDidList(Map<String, Object> 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<InventoryP> findInventoryByDepository(Map<String, Object> 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<MaterialAndPlaceForViewP> findInventoryForStockTaking(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java

@@ -85,7 +85,7 @@ public class MaterialTypeServiceImpl implements MaterialTypeService {
      */
     @Override
     public List<MaterialType> findMaterialTypeByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java

@@ -62,7 +62,7 @@ public class NoticeServiceImpl implements NoticeService {
     @Override
     public List<NoticeP> findNoticeByCondition(Map<String, Object> 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<NoticeP> findAllNoticeForUser(Map<String, Object> 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);

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<String, Object> 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<MaterialAndPlaceForViewP> findPlaceAndMaterialByDidsAndMid(List<Long> dids, Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java

@@ -127,7 +127,7 @@ public class RoleServiceImpl implements RoleService {
      */
     @Override
     public List<RoleAndDepository> findRoleAndDepositoryByCondition(Map<String, Object> 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<RoleAndMaterialType> findRoleAndMaterialTypeByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java

@@ -918,7 +918,7 @@ public class SplitUnitServiceImpl implements SplitUnitService {
      */
     @Override
     public List<SplitInfoP> findSplitInfoPByCondition(Map<String, Object> 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);

src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@@ -239,7 +239,7 @@ public class StockTakingServiceImpl implements StockTakingService {
      */
     @Override
     public List<SimpleStockTakingP> findMyTask(Map<String, Object> 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<SimpleStockTakingP> findMyApply(Map<String, Object> 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);

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},
                     {