From a01a9442cb2d199bef04b6189b15864099ea63a7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 16:22:48 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/index.html | 2 +-
src/main/webapp/views/custOrder/custOrder.html | 8 ++++----
src/main/webapp/views/home/console.html | 2 +-
src/main/webapp/static/js/custOrder/custOrder.js | 8 ++++----
src/main/webapp/views/pda/stockOut.html | 2 +-
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 6 +++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 941160f..a28f355 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -49,13 +49,13 @@
}
@RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎹¤揣")
+ @ManagerAuth(memo = "鎷ｈ揣")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
return workService.stockOut(stockOutParam, getUserId());
}
@RequestMapping("/stock/out/print")
- @ManagerAuth(memo = "鎹¤揣鍗曟墦鍗�")
+ @ManagerAuth(memo = "鎷ｈ揣鍗曟墦鍗�")
public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
return workService.stockOutPrint(stockOutParam, getUserId());
}
@@ -88,7 +88,7 @@
}
@RequestMapping("/stock/out/confirm")
- @ManagerAuth(memo = "鎹¤揣纭")
+ @ManagerAuth(memo = "鎷ｈ揣纭")
public R stockOutConfirm(@RequestBody StockConfirmParam param) {
return workService.stockOutComplete(param, getUserId());
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 212a5a5..0190d0f 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -181,7 +181,7 @@
switch (obj.event) {
// 鎷ｈ揣
case 'stockOut':
- layer.confirm(data.number + ' 璁㈠崟寮�濮嬫崱璐э紵', {shadeClose: true}, function(){
+ layer.confirm(data.number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
layer.closeAll();
$.ajax({
url: baseUrl+"/work/stock/out",
@@ -196,7 +196,7 @@
if (res.code === 200){
layer.confirm(res.msg, {
shadeClose: true
- , btn: ['鎵撳嵃鎹¤揣鍗�']
+ , btn: ['鎵撳嵃鎷ｈ揣鍗�']
}, function() {
layer.closeAll();
printPakouts(data.number);
@@ -246,7 +246,7 @@
break;
// 鎵撳嵃
case 'print':
- layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎹¤揣鍗曪紵', {shadeClose: true}, function(){
+ layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
layer.closeAll();
printPakouts(data.number);
})
@@ -255,7 +255,7 @@
}
});
- // 鎵撳嵃鎹¤揣鍗�
+ // 鎵撳嵃鎷ｈ揣鍗�
function printPakouts(docNumber) {
$.ajax({
url: baseUrl+"/work/stock/out/print",
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 2e807ef..03911d0 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -41,7 +41,7 @@
<script type="text/html" id="operate">
{{#if (d.status == 1){ }}
- <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎹¤揣</a>
+ <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷ｈ揣</a>
{{# } }}
{{#if (d.status == 2){ }}
<a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
@@ -66,7 +66,7 @@
<div id="print-header" style="margin-bottom: 20px">
<div style="text-align: center">
<div style="text-align: center;margin-bottom: 10px">
- <span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
+ <span style="font-family: 瀹嬩綋"> 鎷ｈ揣鍗� </span>
</div>
<img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
@@ -77,10 +77,10 @@
</div>
<div style="margin-top: 10px">
<div style="float: left;width: 50%; text-align: left">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣鏁伴噺锛歿{data.total}}</span>
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣鏁伴噺锛歿{data.total}}</span>
</div>
<div style="float: left; width: 50%; text-align: right">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣浜猴細{{data.workerName}}</span>
</div>
<div style="clear:both;"></div>
</div>
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 492ec9d..892e560 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -174,7 +174,7 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 鎹¤揣鍗曢噺<span class="layui-badge layui-badge-red pull-right">鏈�</span>
+ 鎷ｈ揣鍗曢噺<span class="layui-badge layui-badge-red pull-right">鏈�</span>
</div>
<div class="layui-card-body">
<p class="lay-big-font"><span id="pakoutQtyMonth">0</span></p>
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 601d8ef..29edb2c 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -76,7 +76,7 @@
<ul class="nav">
<li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
<li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">涓婃灦</a></li>
- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鎹¤揣</a></li>
+ <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鎷ｈ揣</a></li>
</ul>
<!-- 涓讳綋鍐呭 -->
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index fbb2867..b478b42 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -171,7 +171,7 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("鎹¤揣鎴愬姛")
+ tips("鎷ｈ揣鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
--
Gitblit v1.9.1