From abf98922f65f1434b9bde62d251cb439189921d1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 三月 2022 13:56:38 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单出库优化】
---
src/main/webapp/static/js/orderTable.js | 4 +-
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2
src/main/webapp/static/js/order/out.js | 47 +++++++++++------------
src/main/webapp/views/order/out.html | 4 +-
src/main/resources/application.yml | 4 +-
5 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f277ee4..ebfe9c2 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -42,7 +42,7 @@
*/
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
- private Long orderNo;
+ private String orderNo;
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b8b74e..38ee0e2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,8 +35,8 @@
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1a6323c..dcd4433 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -24,33 +24,32 @@
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
toolbar: '#orderDetToolbar',
- height: 'full-100',
+ height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{type: 'number', title: '#'}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{type: 'numbers', title: '#'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
- ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
- ,{field: 'weight', align: 'center',title: '閲嶉噺'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
-
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
+ // ,{field: 'name', align: 'center',title: '鍚嶇О'}
+ // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
+ // ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
+ // ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
+ // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
+ // ,{field: 'count', align: 'center',title: '鏁伴噺'}
+ // ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
]],
request: {
diff --git a/src/main/webapp/static/js/orderTable.js b/src/main/webapp/static/js/orderTable.js
index 29cd5f5..1665bd7 100644
--- a/src/main/webapp/static/js/orderTable.js
+++ b/src/main/webapp/static/js/orderTable.js
@@ -13,7 +13,7 @@
var insTb = table.render({
elem: '#originTable',
url: baseUrl + '/order/nav/list/auth',
- height: 'full-100',
+ height: 'full-120',
headers: {token: localStorage.getItem('token')},
request: {
pageName: 'curr',
@@ -37,7 +37,7 @@
// '</p>'].join(''),
defaultToolbar: [],
cols: [[
- // {type: 'number', title: '#'},
+ // {type: 'numbers', title: '#'},
{field: 'orderTime', title: '鏃ユ湡'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}
]],
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 597a12b..e036adf 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -116,8 +116,8 @@
</script>
<!-- 琛屾牱寮� -->
-<script type="text/html" id="hostTpl">
- <span name="hostId$" class="layui-badge layui-badge-gray">{{d.hostId$}}</span>
+<script type="text/html" id="orderNoTpl">
+ <span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
</script>
<script type="text/html" id="statusTpl">
<input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝ｅ父|绂佺敤" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}>
--
Gitblit v1.9.1