From 106fd3c353c2eaac2f31b6f56f3285fefe8dc740 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 10:50:43 +0800
Subject: [PATCH] *
---
src/main/webapp/views/basArmMast/basArmMast.html | 2
src/main/webapp/views/basArmMastSign/basArmMastSign.html | 142 ++++++++++++++++++++++-------------
src/main/java/com/zy/asrs/controller/BasArmMastLogController.java | 3
src/main/java/com/zy/asrs/entity/BasArmMastSign.java | 23 ++++-
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 3
src/main/webapp/static/js/basArmMastSign/basArmMastSign.js | 18 ++--
src/main/java/com/zy/asrs/controller/BasArmMastSignController.java | 4 +
7 files changed, 127 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index a68630b..53c2dcf 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -54,6 +54,9 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("binding_tags")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
index 70b977e..127f80c 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastLogController.java
@@ -54,6 +54,9 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("binding_tags")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
index 5587145..7ea6ad3 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
@@ -43,6 +43,7 @@
convert(param, wrapper);
allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("create_time",false);
return R.ok(basArmMastSignService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -53,6 +54,9 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("create_time")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastSign.java b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
index bf5aa74..abbfff4 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastSign.java
@@ -28,16 +28,16 @@
@ApiModelProperty(value= "鐘舵��")
private Integer status;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "sku")
private String matnr;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "po")
private String po;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "po")
private String upc;
/**
@@ -46,14 +46,14 @@
@ApiModelProperty(value= "璐ф簮")
private String supplier;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "璁㈠崟鍙�")
@TableField("order_no")
private String orderNo;
/**
* 鍒嗘嫞鏍囪
*/
- @ApiModelProperty(value= "鍒嗘嫞鏍囪")
+ @ApiModelProperty(value= "鍒嗘嫞缁戝畾鏍囪")
@TableField("create_time")
private Long createTime;
@@ -88,4 +88,15 @@
// );
+ public String getStatus$() {
+ if (Cools.isEmpty(status)) {return "鏈煡寮傚父";}
+ switch (status){
+ case 0:
+ return "0.鏈爣璁�";
+ case 1:
+ return "1.宸叉爣璁�";
+ default:
+ return "鏈煡寮傚父";
+ }
+ }
}
diff --git a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
index db021fa..7e0ceb8 100644
--- a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
+++ b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
@@ -22,15 +22,15 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'status', align: 'center',title: '鐘舵��'}
- ,{field: 'matnr', align: 'center',title: ''}
- ,{field: 'sku', align: 'center',title: ''}
- ,{field: 'po', align: 'center',title: ''}
- ,{field: 'upc', align: 'center',title: ''}
- ,{field: 'supplier', align: 'center',title: '璐ф簮'}
- ,{field: 'orderNo', align: 'center',title: ''}
- ,{field: 'createTime', align: 'center',title: '鍒嗘嫞鏍囪'}
+ ,{field: 'id', align: 'center',title: 'ID',hide: true}
+ ,{field: 'status$', align: 'center',title: '浠诲姟涓嬪彂鏍囪',hide: false}
+ ,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�',hide: false}
+ ,{field: 'createTime', align: 'center',title: '鍒嗘嫞缁戝畾鏍囪',hide: false}
+ ,{field: 'matnr', align: 'center',title: 'sku',hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku',hide: false}
+ ,{field: 'po', align: 'center',title: 'po',hide: false}
+ ,{field: 'upc', align: 'center',title: 'upc',hide: false}
+ ,{field: 'supplier', align: 'center',title: '璐ф簮',hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/basArmMast/basArmMast.html b/src/main/webapp/views/basArmMast/basArmMast.html
index c26209f..2590c34 100644
--- a/src/main/webapp/views/basArmMast/basArmMast.html
+++ b/src/main/webapp/views/basArmMast/basArmMast.html
@@ -152,7 +152,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">缁戝畾鏍囪: </label>
+ <label class="layui-form-label layui-form-required">鍒嗘嫞缁戝畾鏍囪: </label>
<div class="layui-input-block">
<input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ュ垎鎷ｇ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">
</div>
diff --git a/src/main/webapp/views/basArmMastSign/basArmMastSign.html b/src/main/webapp/views/basArmMastSign/basArmMastSign.html
index a451a53..db982ab 100644
--- a/src/main/webapp/views/basArmMastSign/basArmMastSign.html
+++ b/src/main/webapp/views/basArmMastSign/basArmMastSign.html
@@ -17,21 +17,56 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input" type="text" name="create_time" placeholder="鍒嗘嫞缁戝畾鏍囪" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <select name="status" id="status" class="layui-input" type="text" placeholder="浠诲姟涓嬪彂鏍囪" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value="">浠诲姟涓嬪彂鏍囪</option>
+ <option value="0">0.鏈爣璁�</option>
+ <option value="1">1.宸叉爣璁�</option>
+ </select>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="sku" placeholder="sku" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="po" placeholder="po" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="upc" placeholder="upc" autocomplete="off">
+ </div>
+ </div>
+<!-- <div class="layui-inline" style="width: 300px">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -73,53 +108,56 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐘舵��: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="status" placeholder="璇疯緭鍏ョ姸鎬�" lay-vertype="tips" lay-verify="required">
+ <label class="layui-form-label layui-form-required">浠诲姟涓嬪彂鏍囪锛�</label>
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value="0">0.鏈爣璁�</option>
+ <option value="1">1.宸叉爣璁�</option>
+ </select>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="sku" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="po" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璐ф簮: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍒嗘嫞鏍囪: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" placeholder="璇疯緭鍏ュ垎鎷ｆ爣璁�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="sku" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="po" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">璐ф簮: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鍒嗘嫞鏍囪: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="createTime" placeholder="璇疯緭鍏ュ垎鎷ｆ爣璁�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1