From c26fe7fca62be43dd8933c1ac0944ba1043a2e09 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 23 十月 2024 17:17:15 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/order/order.js | 4 ++-- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 1 + src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java b/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java index 522fdbc..f3c445b 100644 --- a/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java +++ b/src/main/java/com/zy/asrs/entity/param/LocDetlByTimeDTO.java @@ -13,5 +13,6 @@ private String date; private String warehouse; private String mark; + private String workNo; } diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index cd455a0..b876f5d 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -593,6 +593,7 @@ locDetlByTimeDTO.setAnfme(wrkDetlLog.getAnfme()); locDetlByTimeDTO.setOrderNo(wrkDetlLog.getOrderNo()); locDetlByTimeDTO.setMark(wrkDetlLog.getManu()); + locDetlByTimeDTO.setWorkNo(wrkDetlLog.getWrkNo().toString()); locDetlByTimeDTOS.add(locDetlByTimeDTO); } diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js index f6e6b01..8a807c3 100644 --- a/src/main/webapp/static/js/order/order.js +++ b/src/main/webapp/static/js/order/order.js @@ -105,7 +105,7 @@ layer.open({ type: 1, title: false, - area: '820px', + area: '1000px', offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'], shade: .01, shadeClose: true, @@ -125,7 +125,7 @@ {type: 'numbers'}, {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160}, {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, - {field: 'specs', title: '瑙勬牸'}, + {field: 'specs', title: '瑙勬牸', width: 160}, {field: 'batch', title: '鎵瑰彿'}, {field: 'anfme', title: '鏁伴噺'}, {field: 'workQty', title: '浣滀笟鏁伴噺'}, -- Gitblit v1.9.1