root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 清洗上料

Browse Source
This commit is contained in:
gengby
2023-06-16 16:15:00 +08:00
parent edc2f84199
commit 3b1e1a7194
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/ItemProtocol.java
View File

@@ -34,6 +34,8 @@ public class ItemProtocol {
public static String item_to_confirm_finished = "to_confirm_finished"; public static String item_to_confirm_finished = "to_confirm_finished";
//批次号 //批次号
public static String item_to_pcsn = "to_pcsn"; 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"; 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_in_confirm_finish, "上料命令确认完毕", "DB2.W72"));
list.add(new ItemDto(item_to_confirm_finished, "确认完成", "DB2.W74")); 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.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_num, "上料总数量", "DB2.D152"));
list.add(new ItemDto(item_to_all_weight, "上料总重量", "DB2.D156")); list.add(new ItemDto(item_to_all_weight, "上料总重量", "DB2.D156"));
list.add(new ItemDto(item_to_del_task, "任务删除", "DB2.W394")); list.add(new ItemDto(item_to_del_task, "任务删除", "DB2.W394"));

4
wcs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -113,8 +113,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
return true; return true;
}) })
.sorted((order1, order2) -> (order1.getOrder_code().compareTo(order2.getOrder_code()))) .sorted((order1, order2) -> (order1.getOrder_code().compareTo(order2.getOrder_code())))
.skip((currentPageNumber - 1) * pageMaxSize) /* .skip((currentPageNumber - 1) * pageMaxSize)
.limit(pageMaxSize) .limit(pageMaxSize)*/
.collect(Collectors.toList()); .collect(Collectors.toList());
List<ProduceshiftorderDto> skipList = orderList.stream().skip((currentPageNumber - 1) * pageMaxSize) List<ProduceshiftorderDto> skipList = orderList.stream().skip((currentPageNumber - 1) * pageMaxSize)
.limit(pageMaxSize) .limit(pageMaxSize)

2
wcs/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -1,5 +1,5 @@
server: server:
port: 8011 port: 8089
tomcat: tomcat:
accept-count: 1000 accept-count: 1000
max-connections: 10000 max-connections: 10000