From 22e544b28e3fae353f3a257dec4080c17e015a54 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 10 一月 2026 09:10:49 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/LocAroundBind.java | 12 ++++++------
src/main/webapp/views/orderPakout/out.html | 4 ++--
src/main/webapp/static/js/orderPakout/order.js | 4 ++--
src/main/webapp/static/js/orderPakout/out.js | 4 ++--
src/main/webapp/views/locAroundBind/locAroundBind.html | 4 ++--
src/main/java/com/zy/asrs/entity/param/InitDeviceLocParams.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/webapp/static/js/locAroundBind/locAroundBind.js | 6 +++---
src/main/java/com/zy/asrs/controller/LocAroundBindController.java | 4 ++--
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
index 6b028b5..2e5097f 100644
--- a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
@@ -126,7 +126,7 @@
}
/**
- * 鍙版満缁戝畾浣滀笟搴撲綅
+ * 鏈哄彴缁戝畾浣滀笟搴撲綅
*
* @param
* @return
@@ -138,7 +138,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
if (Cools.isEmpty(params.getDevNo())) {
- return R.error("鍙版満鍙蜂笉鑳戒负绌�");
+ return R.error("鏈哄彴鍙蜂笉鑳戒负绌�");
}
if (Cools.isEmpty(params.getStartRow())) {
return R.error("璧峰鎺掍笉鑳戒负绌�");
diff --git a/src/main/java/com/zy/asrs/entity/LocAroundBind.java b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
index 77f9731..f129d5b 100644
--- a/src/main/java/com/zy/asrs/entity/LocAroundBind.java
+++ b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -20,16 +20,16 @@
private Long id;
/**
- * 鍙版満ID
+ * 鏈哄彴ID
*/
- @ApiModelProperty(value= "鍙版満ID")
+ @ApiModelProperty(value= "鏈哄彴ID")
@TableField("dev_id")
private Long devId;
/**
- * 鍙版満鍙�
+ * 鏈哄彴鍙�
*/
- @ApiModelProperty(value= "鍙版満鍙�")
+ @ApiModelProperty(value= "鏈哄彴鍙�")
@TableField("dev_no")
private String devNo;
@@ -57,8 +57,8 @@
}
// LocAroundBind locAroundBind = new LocAroundBind(
-// null, // 鍙版満ID[闈炵┖]
-// null, // 鍙版満鍙穂闈炵┖]
+// null, // 鏈哄彴ID[闈炵┖]
+// null, // 鏈哄彴鍙穂闈炵┖]
// null, // 搴撲綅ID[闈炵┖]
// null // 搴撲綅鐮乕闈炵┖]
// );
diff --git a/src/main/java/com/zy/asrs/entity/param/InitDeviceLocParams.java b/src/main/java/com/zy/asrs/entity/param/InitDeviceLocParams.java
index e5a67e5..dcf2f1c 100644
--- a/src/main/java/com/zy/asrs/entity/param/InitDeviceLocParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/InitDeviceLocParams.java
@@ -7,13 +7,13 @@
import io.swagger.annotations.ApiModel;
@Data
-@ApiModel(value = "InitDeviceLocParams", description = "鍒濆鍖栧彴鏈哄簱浣嶅弬鏁�")
+@ApiModel(value = "InitDeviceLocParams", description = "鍒濆鍖栨満鍙板簱浣嶅弬鏁�")
@Accessors(chain = true)
public class InitDeviceLocParams implements Serializable {
private static final long serialVersionUID = 1L;
- // 鍙版満鍙�
+ // 鏈哄彴鍙�
private String devNo;
// 璧峰鎺�
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index fe161e4..5fc61d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1476,7 +1476,7 @@
}
List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
if (Objects.isNull(binds) || binds.isEmpty()) {
- throw new CoolException("鍙版満鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
+ throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
}
Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
diff --git a/src/main/webapp/static/js/locAroundBind/locAroundBind.js b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
index 8b45ac4..d5517d9 100644
--- a/src/main/webapp/static/js/locAroundBind/locAroundBind.js
+++ b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
@@ -23,8 +23,8 @@
cols: [[
{ type: 'checkbox' }
, { field: 'id', align: 'center', title: 'ID' }
- , { field: 'devId', align: 'center', title: '鍙版満ID' }
- , { field: 'devNo', align: 'center', title: '鍙版満鍙�' }
+ , { field: 'devId', align: 'center', title: '鏈哄彴ID' }
+ , { field: 'devNo', align: 'center', title: '鏈哄彴鍙�' }
, { field: 'blocId', align: 'center', title: '搴撲綅ID', hide: true }
, { field: 'blocNo', align: 'center', title: '搴撲綅鐮�' }
, { fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 120 }
@@ -127,7 +127,7 @@
if (res.data) {
layer.open({
type: 1,
- title: '鍙版満缁戝畾浣滀笟搴撲綅',
+ title: '鏈哄彴缁戝畾浣滀笟搴撲綅',
area: ["400px"],
maxmin: true,
shadeClose: true,
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 1d77e0a..0e6826c 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -125,7 +125,7 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
- {field: 'standby1', title: '鍙版満'},
+ {field: 'standby1', title: '鏈哄彴'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -239,7 +239,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
- {field: 'standby1', title: '鍙版満', edit: true},
+ {field: 'standby1', title: '鏈哄彴', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index f829264..0cd07ec 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -34,7 +34,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'standby1', align: 'center',title: '鍙版満鍙�'}
+ ,{field: 'standby1', align: 'center',title: '鏈哄彴鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -159,7 +159,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'standby1', title: '鍙版満鍙�', align: 'center'},
+ {field: 'standby1', title: '鏈哄彴鍙�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
diff --git a/src/main/webapp/views/locAroundBind/locAroundBind.html b/src/main/webapp/views/locAroundBind/locAroundBind.html
index 8f1b24d..efb7f8b 100644
--- a/src/main/webapp/views/locAroundBind/locAroundBind.html
+++ b/src/main/webapp/views/locAroundBind/locAroundBind.html
@@ -68,7 +68,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鏈哄彴: </label>
<div class="layui-input-block">
- <input class="layui-input" name="devNo" placeholder="璇疯緭鍏ュ彴鏈哄彿" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="devNo" placeholder="璇疯緭鍏ユ満鍙板彿" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -97,7 +97,7 @@
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
<div class="layui-form-item">
- <label class="layui-form-label">鍙版満鍙�</label>
+ <label class="layui-form-label">鏈哄彴鍙�</label>
<div class="layui-input-inline">
<input type="text" name="devNo" autocomplete="off" class="layui-input">
</div>
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index 1d8a45f..09bbf47 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -107,9 +107,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鍙版満鍙�:</label>
+ <label class="layui-form-label">鏈哄彴鍙�:</label>
<div class="layui-input-inline">
- <input name="standby1" class="layui-input" placeholder="鍙版満鍙�"/>
+ <input name="standby1" class="layui-input" placeholder="鏈哄彴鍙�"/>
</div>
</div>
<!-- <div class="layui-inline">-->
--
Gitblit v1.9.1