From ba8f0957e66eebe71bae091ab23128ff075d37f9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 09 十二月 2025 18:01:00 +0800
Subject: [PATCH] #出库单

---
 src/main/java/com/zy/asrs/enums/OrderTypeEnum.java                |   11 +
 src/main/webapp/static/js/checkOrder/checkOrder.js                |   35 ++----
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java            |    1 
 src/main/webapp/views/adjustOrder/adjustOrder.html                |    3 
 src/main/webapp/views/orderPakout/order.html                      |    3 
 src/main/webapp/static/js/adjustOrder/adjustOrder.js              |   35 ++----
 src/main/webapp/views/order/order.html                            |    3 
 src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java |    3 
 src/main/webapp/views/checkOrder/checkOrder.html                  |    3 
 src/main/webapp/static/js/orderPakout/order.js                    |   51 +++------
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java       |   14 ++
 src/main/webapp/static/js/order/order.js                          |   48 ++++-----
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java      |   57 ++++++++++-
 src/main/webapp/static/js/common.js                               |    2 
 src/main/webapp/static/js/orderPakin/order.js                     |    2 
 15 files changed, 151 insertions(+), 120 deletions(-)

diff --git a/src/main/java/com/zy/asrs/enums/OrderTypeEnum.java b/src/main/java/com/zy/asrs/enums/OrderTypeEnum.java
index ec2aecb..d1b29f0 100644
--- a/src/main/java/com/zy/asrs/enums/OrderTypeEnum.java
+++ b/src/main/java/com/zy/asrs/enums/OrderTypeEnum.java
@@ -3,13 +3,18 @@
 public enum OrderTypeEnum {
     //涓婃灦娲惧伐鍗�
     PICKING(1, "涓婃灦娲惧伐鍗�"),
-    //澶囪揣璋冩嫧鍗�
-    TRANSFER(2, "澶囪揣璋冩嫧鍗�"),
+    //澶囪揣娲惧伐鍗�
+    TRANSFER(2, "澶囪揣娲惧伐鍗�"),
     INVENTORY(3, "鐩樼偣鍗�"),
     ADJUSTMENT(4, "搴撳瓨璋冩暣鍗�"),
     //澶囪揣鍗�
-    STOCK(5, "澶囪揣鍗�");
+    STOCK(5, "澶囪揣鍗�"),
 
+    //澶囪揣鍑哄簱鍗�
+    STOCK_OUT(6, "澶囪揣鍑哄簱鍗�"),
+
+    //澶囪揣鍏ュ簱鍗�
+    STOCK_IN(7, "澶囪揣鍏ュ簱鍗�");
 
 
     public Integer type;
diff --git a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
index 618b165..3adc46b 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
@@ -207,6 +207,9 @@
         }
         List<CheckOrderDetl> selectList = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
         for (CheckOrderDetl checkOrderDetl : selectList) {
+            if (checkOrderDetl.getDiffQty().compareTo(BigDecimal.ZERO) == 0){
+                continue;
+            }
 
             LocDetl locDetl = locDetlService.selectById(checkOrderDetl.getLocDetlId());
             if (Cools.isEmpty(locDetl)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9fdf6fd..4659d70 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -31,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -411,6 +412,19 @@
 //        OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
         CheckOrder checkOrder = checkOrderService.selectOne(new EntityWrapper<CheckOrder>().eq("order_no", orderNo));
         int ioType = checkOrder.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
+        if(ioType == 101){
+            boolean DiffQty = taskDto.getLocDtos().stream().allMatch(locDto ->
+                    locDetlService.selectOne(new EntityWrapper<LocDetl>()
+                            .eq("loc_no", locDto.getLocNo())
+                            .eq("matnr", locDto.getMatnr())
+                            .eq("batch", locDto.getBatch())
+                            .eq("standby1",locDto.getStandby2())
+                    ).getDiffQty().compareTo(BigDecimal.ZERO) == 0
+            );
+            if (!DiffQty){
+                ioType = 103;
+            }
+        }
         StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index a797915..75e2e92 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,6 +2,7 @@
 
 import com.core.common.Cools;
 import com.zy.asrs.entity.Order;
+import com.zy.asrs.enums.OrderTypeEnum;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index e8625d6..d89b147 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -5,13 +5,9 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.OrderTypeEnum;
+import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -21,6 +17,7 @@
 import com.zy.common.model.MesPakoutParam;
 import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -46,6 +43,10 @@
     private ApiLogService apiLogService;
     @Autowired
     private DocTypeService docTypeService;
+    @Autowired
+    private OrderPakinService  orderPakinService;
+    @Autowired
+    private OrderDetlPakinService orderDetlPakinService;
 
     @Transactional
     public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -114,6 +115,15 @@
         for (OrderDetl orderDetl : orderDetlList){
             orderDetl.setWorkQty(0D);
             OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
+            //灏忔澗锛氬鏋滀笅鍙戝璐ф淳宸ュ崟锛屽垯鐢熸垚澶囪揣鍑哄簱+澶囪揣鍏ュ簱
+            if (order.getDocType().equals(OrderTypeEnum.TRANSFER.type.longValue())){
+                try {
+                    ifTransfetInsertStockIn(order,orderDetl);
+                }catch (Exception e){
+                    throw new CoolException(e.getMessage());
+                }
+            }
+
         }
         // 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
         if (!orderService.updateSettle(order.getId(), 2L, null)) {
@@ -122,8 +132,41 @@
         return SUCCESS;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void ifTransfetInsertStockIn(Order order, OrderDetl orderDetl){
+        OrderPakin orderPakin = new OrderPakin();
+        BeanUtils.copyProperties(order,orderPakin);
+        orderPakin.setDocType(OrderTypeEnum.STOCK_IN.type.longValue());
+
+        if (!orderPakinService.insert(orderPakin)){
+            throw new CoolException("鎻掑叆澶囪揣鍏ュ簱鍗曞け璐�");
+        }
+        OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
+        BeanUtils.copyProperties(orderDetl,orderDetlPakin);
+        orderDetlPakin.setOrderId(orderPakin.getId());
+
+
+        if (!orderDetlPakinService.insert(orderDetlPakin)){
+            throw new CoolException("鎻掑叆澶囪揣鍏ュ簱鍗曞け璐�");
+        }
+
+
+    }
+
     @Transactional
     public ReturnT<String> startOrderInAndOutUtil(Order order) {
+        //灏忔澗锛氳疆璁埌澶囪揣娲惧伐鍗曟槸鏌ヨ澶囪揣鍏ュ簱鍗曟槸鍚﹀畬鎴�
+        if (order.getDocType().equals(OrderTypeEnum.STOCK_IN.type.longValue())){
+            return SUCCESS;
+        }
+        if (order.getDocType().equals(OrderTypeEnum.TRANSFER.type.longValue())){
+            OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo());
+            if (null != orderPakin) {
+                if (!orderPakin.getSettle().equals(4L)){
+                    return SUCCESS;
+                }
+            }
+        }
         DocType docType = docTypeService.selectById(order.getDocType());
         if (null == docType) {
             return SUCCESS;
diff --git a/src/main/webapp/static/js/adjustOrder/adjustOrder.js b/src/main/webapp/static/js/adjustOrder/adjustOrder.js
index 70ba874..a5936e9 100644
--- a/src/main/webapp/static/js/adjustOrder/adjustOrder.js
+++ b/src/main/webapp/static/js/adjustOrder/adjustOrder.js
@@ -107,24 +107,22 @@
             var offset = $a.offset();
             var top = offset.top;
             var left = offset.left;
-            layer.open({
+            admin.open({
                 type: 1,
-                title: false,
-                area: '1000px',
-                offset: [top + 'px', (left - 700 + $a.outerWidth()) + 'px'],
-                shade: .01,
-                shadeClose: true,
-                fixed: false,
-                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
-                success: function (layero) {
+                title: '鍗曟嵁鏄庣粏',
+                height: '450px',
+                content: $('#orderItem').html(),
+                area: '78%',
+                success: function (layero, dIndex) {
                     table.render({
-                        elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/checkOrderDetl/list/auth',
+                        elem: '#itemTable',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/checkOrderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
+                        height: '450px;',
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
@@ -134,14 +132,6 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'diffQty', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
-                            // {field: 'unit', title: '鍗曚綅'},
-                            // {
-                            //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                            //         return util.toDateString(d.createTime);
-                            //     },  width: 180
-                            // },
-                            // {field: 'inQty', title: '宸插叆搴撻噺'},
-                            // {field: 'color', title: '棰滆壊'},
                             {field: 'specs', title: '瑙勬牸'},
                             {field: 'status$', title: '鐘舵��'}
                         ]],
@@ -160,10 +150,7 @@
                         response: {
                             statusCode: 200
                         },
-                        done:  (res) => {
-                            if(res.code == 403){
-                                window.top.location.href = baseUrl+"/";
-                            }
+                        done: function () {
                             $(layero).find('.layui-table-view').css('margin', '0');
                         },
                         size: ''
diff --git a/src/main/webapp/static/js/checkOrder/checkOrder.js b/src/main/webapp/static/js/checkOrder/checkOrder.js
index cb64eb4..6ef09e5 100644
--- a/src/main/webapp/static/js/checkOrder/checkOrder.js
+++ b/src/main/webapp/static/js/checkOrder/checkOrder.js
@@ -109,24 +109,22 @@
             var offset = $a.offset();
             var top = offset.top;
             var left = offset.left;
-            layer.open({
+            admin.open({
                 type: 1,
-                title: false,
-                area: '1000px',
-                offset: [top + 'px', (left - 700 + $a.outerWidth()) + 'px'],
-                shade: .01,
-                shadeClose: true,
-                fixed: false,
-                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
-                success: function (layero) {
+                title: '鍗曟嵁鏄庣粏',
+                height: '450px',
+                content: $('#orderItem').html(),
+                area: '78%',
+                success: function (layero, dIndex) {
                     table.render({
-                        elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/checkOrderDetl/list/auth',
+                        elem: '#itemTable',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/checkOrderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
+                        height: '450px;',
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
@@ -138,14 +136,6 @@
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'workQty', title: '鐩樼偣鏁伴噺'},
                             {field: 'diffQty', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
-                            // {field: 'unit', title: '鍗曚綅'},
-                            // {
-                            //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                            //         return util.toDateString(d.createTime);
-                            //     },  width: 180
-                            // },
-                            // {field: 'inQty', title: '宸插叆搴撻噺'},
-                            // {field: 'color', title: '棰滆壊'},
                             {field: 'specs', title: '瑙勬牸'},
                             {field: 'status$', title: '鐘舵��'}
                         ]],
@@ -164,10 +154,7 @@
                         response: {
                             statusCode: 200
                         },
-                        done:  (res) => {
-                            if(res.code == 403){
-                                window.top.location.href = baseUrl+"/";
-                            }
+                        done: function () {
                             $(layero).find('.layui-table-view').css('margin', '0');
                         },
                         size: ''
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7858180..062db48 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -32,7 +32,7 @@
     } else {
         var p = time.getMilliseconds();
         if (p < 10) {
-            p = "00" + p;
+            p = "0" + p;
         }
         if (p <  100) {
             p = "0" + p;
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6345ea7..940bfa4 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -101,42 +101,34 @@
             var offset = $a.offset();
             var top = offset.top;
             var left = offset.left;
-            layer.open({
+
+            admin.open({
                 type: 1,
-                title: false,
-                area: '820px',
-                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
-                shade: .01,
-                shadeClose: true,
-                fixed: false,
-                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
-                success: function (layero) {
+                title: '鍗曟嵁鏄庣粏',
+                height: '450px',
+                content: $('#orderItem').html(),
+                area: '78%',
+                success: function (layero, dIndex) {
                     table.render({
-                        elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/orderDetl/list/auth',
+                        elem: '#itemTable',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/orderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
+                        height: '450px;',
                         cellMinWidth: 100,
                         cols: [[
-                            {type: 'numbers'},
-                            {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
-                            {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            {field: 'specs', title: '瑙勬牸'},
-                            {field: 'batch', title: '鎵瑰彿'},
-                            {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
-                            {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
-                            {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
-                            // {field: 'unit', title: '鍗曚綅'},
-                            // {
-                            //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                            //         return util.toDateString(d.createTime);
-                            //     },  width: 180
-                            // },
-                            // {field: 'inQty', title: '宸插叆搴撻噺'},
-                            // {field: 'color', title: '棰滆壊'}
+                            { type: 'numbers' },
+                            { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                            { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+                            { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+                            { field: 'batch', title: '鎵瑰彿' },
+                            { field: 'anfme', title: '寰呭畬缁撴暟閲�' },
+                            { field: 'workQty', title: '寰呬笂鎶ユ暟閲�' },
+                            { field: 'qty', title: '宸插畬缁撴暟閲�', style: 'font-weight: bold' },
+                            { field: 'specs', title: '瑙勬牸' }
                         ]],
                         request: {
                             pageName: 'curr',
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index c9c0414..60ab736 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -119,7 +119,7 @@
                             { type: 'numbers' },
                             { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
                             { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
-                            { field: 'suppCode', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+                            { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
                             { field: 'batch', title: '鎵瑰彿' },
                             { field: 'anfme', title: '鏁伴噺' },
                             { field: 'workQty', title: '浣滀笟鏁伴噺' },
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index b28b5ff..4f4ad51 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -99,46 +99,33 @@
             doModify(data.id, data.orderNo, 4);
         } else if (layEvent === 'look') {
             var $a = $(obj.tr).find('a[lay-event="look"]');
-            var offset = $a.offset();
-            var top = offset.top;
-            var left = offset.left;
-            layer.open({
+            admin.open({
                 type: 1,
-                title: false,
-                area: '820px',
-                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
-                shade: .01,
-                shadeClose: true,
-                fixed: false,
-                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
-                success: function (layero) {
+                title: '鍗曟嵁鏄庣粏',
+                height: '450px',
+                content: $('#orderItem').html(),
+                area: '78%',
+                success: function (layero, dIndex) {
                     table.render({
-                        elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/order/pakout/orderDetl/list/auth',
+                        elem: '#itemTable',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/order/pakout/orderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
+                        height: '450px;',
                         cellMinWidth: 100,
                         cols: [[
-                            {type: 'numbers'},
-                            {field: 'matnr', title: '闆朵欢浠g爜', width: 160},
-                            {field: 'maktx', title: '闆朵欢鍚嶇О', width: 160},
-                            // {field: 'batch', title: '鎵瑰彿'},
-                            {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�'},
-                            {field: 'anfme', title: '鏁伴噺'},
-                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
-                            {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
-                            // {field: 'unit', title: '鍗曚綅'},
-                            // {
-                            //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
-                            //         return util.toDateString(d.createTime);
-                            //     },  width: 180
-                            // },
-                            // {field: 'inQty', title: '宸插叆搴撻噺'},
-                            // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'}
+                            { type: 'numbers' },
+                            { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                            { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+                            { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+                            { field: 'batch', title: '鎵瑰彿' },
+                            { field: 'anfme', title: '鏁伴噺' },
+                            { field: 'workQty', title: '浣滀笟鏁伴噺' },
+                            { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
+                            { field: 'specs', title: '瑙勬牸' }
                         ]],
                         request: {
                             pageName: 'curr',
diff --git a/src/main/webapp/views/adjustOrder/adjustOrder.html b/src/main/webapp/views/adjustOrder/adjustOrder.html
index 88755a2..e230d43 100644
--- a/src/main/webapp/views/adjustOrder/adjustOrder.html
+++ b/src/main/webapp/views/adjustOrder/adjustOrder.html
@@ -118,6 +118,9 @@
         </a>
     </span>
 </script>
+<script type="text/html" id="orderItem">
+    <table id="itemTable" lay-filter="itemTable"></table>
+</script>
 <script type="text/html" id="orderNoTpl">
     {{d.orderNo}}
     {{# if(d.settle > 1 && d.settle !== 3){ }}
diff --git a/src/main/webapp/views/checkOrder/checkOrder.html b/src/main/webapp/views/checkOrder/checkOrder.html
index 4c4bc30..a77d406 100644
--- a/src/main/webapp/views/checkOrder/checkOrder.html
+++ b/src/main/webapp/views/checkOrder/checkOrder.html
@@ -124,6 +124,9 @@
         </a>
     </span>
 </script>
+<script type="text/html" id="orderItem">
+    <table id="itemTable" lay-filter="itemTable"></table>
+</script>
 <script type="text/html" id="orderNoTpl">
     {{d.orderNo}}
     {{# if(d.settle > 1 && d.settle !== 3){ }}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 3e88192..6b14702 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -301,6 +301,9 @@
 
 
 </script>
+<script type="text/html" id="orderItem">
+    <table id="itemTable" lay-filter="itemTable"></table>
+</script>
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index f87b9bc..f5d3d1a 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -309,6 +309,9 @@
 
 
 </script>
+<script type="text/html" id="orderItem">
+    <table id="itemTable" lay-filter="itemTable"></table>
+</script>
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>

--
Gitblit v1.9.1