From 78f3d7dc497cb6374a2b07debb177ba814935c52 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 15:13:03 +0800
Subject: [PATCH] *
---
src/main/webapp/views/basCrnp/basCrnp.html | 88 ++++++++++++++++++++++----------------------
src/main/resources/mapper/LocMastMapper.xml | 1
src/main/java/com/zy/asrs/entity/LocMast.java | 4 --
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 6 ++
4 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index e95f0b7..d32607a 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -41,7 +41,11 @@
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+// return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
+ List<BasCrnp> basCrnpList = basCrnpService.selectList(wrapper);
+ Page<BasCrnp> page = new Page<BasCrnp>(0, 100).setRecords(basCrnpList);
+ page.setTotal(basCrnpList.size());
+ return R.ok(page);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 8566375..3cd47ea 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -183,10 +183,6 @@
@TableField("CTN_NO")
private String ctnNo;
- @ApiModelProperty(value= "")
- @TableField("STATUS")
- private String status;
-
@TableField(value = "CONTAINER_CODE",exist = false)
private String containerCode;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 6c4385a..7f04c45 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -35,7 +35,6 @@
<result column="PDC_TYPE" property="PdcType" />
<result column="BARCODE" property="barcode" />
<result column="CTN_NO" property="ctnNo" />
- <result column="STATUS" property="status" />
<result column="CONTAINER_CODE" property="containerCode" />
<result column="CONTAINER_TYPE_CODE" property="containerTypeCode" />
<result column="EMPTY_CONTAINER" property="emptyContainer" />
diff --git a/src/main/webapp/views/basCrnp/basCrnp.html b/src/main/webapp/views/basCrnp/basCrnp.html
index 502afcc..42b3c7e 100644
--- a/src/main/webapp/views/basCrnp/basCrnp.html
+++ b/src/main/webapp/views/basCrnp/basCrnp.html
@@ -38,50 +38,50 @@
<!--</div>-->
<!--</div>-->
<!--</div>-->
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="frmLocno" class="layui-input" name="frm_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="frmLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愬簱浣�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryByfrmLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryByfrmLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="frmSta" class="layui-input" name="frm_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="frmSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愮珯" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basDevpQueryByfrmSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryByfrmStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="toSta" class="layui-input" name="to_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="toSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣绔�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="basDevpQueryBytoSta" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBytoStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="toLocno" class="layui-input" name="to_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="toLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣搴撲綅" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBytoLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBytoLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="frmLocno" class="layui-input" name="frm_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="frmLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愬簱浣�" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locMastQueryByfrmLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locMastQueryByfrmLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="frmSta" class="layui-input" name="frm_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="frmSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="婧愮珯" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basDevpQueryByfrmSta" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basDevpQueryByfrmStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="toSta" class="layui-input" name="to_sta" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="toSta$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣绔�" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="basDevpQueryBytoSta" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="basDevpQueryBytoStaSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="toLocno" class="layui-input" name="to_locno" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">-->
+<!-- <input id="toLocno$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩爣搴撲綅" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locMastQueryBytoLocno" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locMastQueryBytoLocnoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
--
Gitblit v1.9.1