From 90b911dc30523c8511a8fb15695e1e78d1cce151 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期二, 06 九月 2022 08:41:44 +0800 Subject: [PATCH] # --- src/main/resources/mapper/ItemMapper.xml | 2 +- src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 1 + src/main/webapp/static/js/tableData2.js | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java index 61b6dce..20bfcff 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java @@ -165,6 +165,7 @@ if (Cools.isEmpty(item)) { return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳"); } + // item.setType("1"); // if (!item.getType().equals("1")) { // throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�"); diff --git a/src/main/resources/mapper/ItemMapper.xml b/src/main/resources/mapper/ItemMapper.xml index 2d23645..efd8d18 100644 --- a/src/main/resources/mapper/ItemMapper.xml +++ b/src/main/resources/mapper/ItemMapper.xml @@ -82,7 +82,7 @@ </if> </select> <select id="inspected" resultMap="BaseResultMap"> - select * from man_item where realLADate is not null + select * from man_item where real_end_time is not null </select> <select id="finished" resultMap="BaseResultMap"> select * from man_item where realLADate is null and realinDate is not null diff --git a/src/main/webapp/static/js/tableData2.js b/src/main/webapp/static/js/tableData2.js index 0433562..6d789d4 100644 --- a/src/main/webapp/static/js/tableData2.js +++ b/src/main/webapp/static/js/tableData2.js @@ -36,10 +36,12 @@ $.ajax({ url: baseurl + '/pms/flowStatus/list/auth', type: 'GET', - data: {}, + data: { + 'is_asrs':0 + }, success: function (res) { - - } + console.log(res); + } }) for (var i = 0; i < proData.length; i++) { var str = "<th class='xiangmu'>" + proData[i] + "</th>" -- Gitblit v1.9.1