diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/ItemProtocol.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/ItemProtocol.java index 8f436d3d..d991a5c9 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/ItemProtocol.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/ItemProtocol.java @@ -34,6 +34,8 @@ public class ItemProtocol { public static String item_to_confirm_finished = "to_confirm_finished"; //批次号 public static String item_to_pcsn = "to_pcsn"; + //储料仓号 + public static String item_to_storage_num = "to_storage_num"; //上料总数量 public static String item_to_all_num = "to_all_num"; //上料总重量 @@ -116,7 +118,7 @@ public class ItemProtocol { list.add(new ItemDto(item_to_in_confirm_finish, "上料命令确认完毕", "DB2.W72")); list.add(new ItemDto(item_to_confirm_finished, "确认完成", "DB2.W74")); list.add(new ItemDto(item_to_pcsn, "批次号", "DB2.D84")); - list.add(new ItemDto(item_to_pcsn, "储料仓号", "DB2.D88")); + list.add(new ItemDto(item_to_storage_num, "储料仓号", "DB2.D88")); list.add(new ItemDto(item_to_all_num, "上料总数量", "DB2.D152")); list.add(new ItemDto(item_to_all_weight, "上料总重量", "DB2.D156")); list.add(new ItemDto(item_to_del_task, "任务删除", "DB2.W394")); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index aa4ce8c8..23dcce1f 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -113,8 +113,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A return true; }) .sorted((order1, order2) -> (order1.getOrder_code().compareTo(order2.getOrder_code()))) - .skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) + /* .skip((currentPageNumber - 1) * pageMaxSize) + .limit(pageMaxSize)*/ .collect(Collectors.toList()); List skipList = orderList.stream().skip((currentPageNumber - 1) * pageMaxSize) .limit(pageMaxSize) diff --git a/wcs/nladmin-system/src/main/resources/config/application-prod.yml b/wcs/nladmin-system/src/main/resources/config/application-prod.yml index d117748a..3b2f44d8 100644 --- a/wcs/nladmin-system/src/main/resources/config/application-prod.yml +++ b/wcs/nladmin-system/src/main/resources/config/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8011 + port: 8089 tomcat: accept-count: 1000 max-connections: 10000