From 0b3c92eef1a0252e901e572871ce3a7a0e2f4516 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 26 三月 2022 13:48:40 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单明细添加单据编号】
---
src/main/resources/mapper/OrderDetlMapper.xml | 1
src/main/webapp/static/js/orderTable.js | 4
src/main/java/com/zy/asrs/entity/OrderDetl.java | 8 ++
src/main/webapp/static/js/order/out.js | 110 ++++++++----------------------------
src/main/webapp/views/order/out.html | 4
src/main/resources/application.yml | 4
6 files changed, 41 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index cf557a8..f277ee4 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -38,6 +38,14 @@
private Long orderId;
/**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private Long orderNo;
+
+
+ /**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 38ee0e2..2b8b74e 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/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 28c3977..ddd99a7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetl">
<id column="id" property="id" />
<result column="order_id" property="orderId" />
+ <result column="order_no" property="orderNo" />
<result column="anfme" property="anfme" />
<result column="qty" property="qty" />
<result column="matnr" property="matnr" />
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 6a2ff74..1a6323c 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -1,7 +1,5 @@
var pageCurr;
-var tableData;
var insTb2;
-const sensorType = 5;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -18,95 +16,40 @@
var treeTable = layui.treeTable;
var xmSelect = layui.xmSelect;
- // 璁惧绫诲瀷鏁版嵁
- var modelTb = treeTable.render({
- elem: '#nothing',
- url: baseUrl+'/sensorModel/list/auth',
- headers: {token: localStorage.getItem('token')},
- tree: {
- iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
- isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
- idName: 'id', // id瀛楁鍚嶇О
- pidName: 'parentId' // pid瀛楁鍚嶇О
- },
- cols: [[
- {type: 'checkbox'}
- ,{type: 'numbers'}
- ,{field: 'name', align: 'left',title: '鍚嶇О', minWidth: 150}
- ]],
- done: function (data) {
- modelTb.expandAll();
- }
- });
-
insTb2 = table.render({
- elem: '#sensorTable',
+ elem: '#orderDetlTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/sensor/list/auth?sensor_type='+sensorType,
+ url: baseUrl+'/orderDetl/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#sensorToolbar',
+ toolbar: '#orderDetToolbar',
height: 'full-100',
cols: [[
{type: 'checkbox'}
- // ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'hostId$', align: 'center',title: '鎵�灞為」鐩�', templet: '#hostTpl', width: 130}
- // ,{field: 'sensorType$', align: 'center',title: '璁惧绫诲瀷'}
- ,{field: 'uuid', align: 'center',title: '璁惧缂栫爜', width: 160}
- ,{field: 'location', align: 'center',title: '鍦扮悊浣嶇疆', width: 180, style: 'font-size: 13px', hide: false}
- ,{field: 'sensorModel$', align: 'center',title: '璁惧鍨嬪彿', width: 130, hide: false}
- // ,{field: 'ccid', align: 'center',title: 'CCID'}
- ,{field: 'sim', align: 'center',title: 'sim鍗″彿',hide: true}
- // ,{field: 'name', align: 'center',title: '璁惧鍚�'}
- // ,{field: 'topic', align: 'center',title: '涓婚'}
- // ,{field: 'ip', align: 'center',title: 'ip'}
- // ,{field: 'port', align: 'center',title: '绔彛'}
- // ,{field: 'data', align: 'center',title: '鎶ユ枃'}
- // ,{field: 'lon', align: 'center',title: '缁忓害'}
- // ,{field: 'lat', align: 'center',title: '绾害'}
- ,{field: 'signal', align: 'center',title: '淇″彿鍊�'}
- ,{field: 'battery', align: 'center',title: '鐢甸噺',hide: true}
- // ,{field: 'charge$', align: 'center',title: '鍏呯數鐘舵��'}
- // ,{field: 'tiltX', align: 'center',title: 'x杞村�炬枩'}
- // ,{field: 'tiltY', align: 'center',title: 'y杞村�炬枩'}
- // ,{field: 'tiltZ', align: 'center',title: 'z杞村�炬枩'}
- // ,{field: 'tilt$', align: 'center',title: '鍊炬枩鐘舵��'}
- ,{field: 'tempe', align: 'center',title: '娓╁害', hide: true}
- ,{
- field: 'online', title: '缃戠粶', templet: function (d) {
- var strs = [
- '<span class="text-success">鍦ㄧ嚎</span>',
- '<span class="text-danger">绂荤嚎</span>'
- ];
- return strs[d.online?0:1];
- }, align: 'center', sort: true
- }
- ,{
- field: 'error', title: '鐘舵��', templet: function (d) {
- var strs = [
- '<span class="layui-badge layui-badge-red">寮傚父</span>',
- '<span class="layui-badge layui-badge-green">姝ｅ父</span>'
- ];
- return strs[d.error?0:1];
- }, align: 'center', sort: false, minWidth: 70, hide: false
- }
- // ,{field: 'worn$', align: 'center',title: '鐮存崯鐘舵��'}
- // ,{field: 'overflow$', align: 'center',title: '瀹氱偣姘翠綅'}
- // ,{field: 'nsAngle', align: 'center',title: '鍗楀寳瑙掑害'}
- // ,{field: 'waterGage', align: 'center',title: '绠￠亾姘村帇'}
- // ,{field: 'harmGas', align: 'center',title: '鏈夊姘斾綋'}
- // ,{field: 'lnGas', align: 'center',title: '鍙噧姘斾綋'}
- // ,{field: 'hsGas', align: 'center',title: '纭寲姘㈡皵浣�'}
- // ,{field: 'reserve0', align: 'center',title: '棰勭暀0'}
- // ,{field: 'reserve1', align: 'center',title: '棰勭暀1'}
- // ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 120, unresize: true}
- // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿', minWidth: 170}
- // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'addr', align: 'center',title: '璇︾粏鍦板潃', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{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: '鍨嬪彿'}
+ ,{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: '澶囨敞'}
+
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
]],
@@ -129,7 +72,6 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- tableData = table.cache.sensorTable;
pageCurr=curr;
limit();
}
diff --git a/src/main/webapp/static/js/orderTable.js b/src/main/webapp/static/js/orderTable.js
index 3beb1ea..29cd5f5 100644
--- a/src/main/webapp/static/js/orderTable.js
+++ b/src/main/webapp/static/js/orderTable.js
@@ -39,7 +39,7 @@
cols: [[
// {type: 'number', title: '#'},
{field: 'orderTime', title: '鏃ユ湡'},
- {field: 'orderNo', title: '缂栧彿', align: 'center'}
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}
]],
done: function (res, curr, count) {
console.log(res)
@@ -82,7 +82,7 @@
table.on('row(originTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
- insTb2.reload({where: {host_id: obj.data.id}, page: {curr: 1}});
+ insTb2.reload({where: {order_id: obj.data.id}, page: {curr: 1}});
});
/* 鏄剧ず琛ㄥ崟寮圭獥 */
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 89c3d31..597a12b 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -92,7 +92,7 @@
</div>
</div>
</form>
- <table id="sensorTable" lay-filter="sensorTable"></table>
+ <table id="orderDetlTable" lay-filter="orderDetlTable"></table>
</div>
</div>
</div>
@@ -100,7 +100,7 @@
</div>
<!-- 澶村伐鍏锋爮 -->
-<script type="text/html" id="sensorToolbar">
+<script type="text/html" id="orderDetToolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon"></i>鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon"></i>鍒犻櫎</button>
--
Gitblit v1.9.1