From 60a48ba8f8e82f35c3f6262c45eee00b70289c0e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 三月 2021 10:05:55 +0800
Subject: [PATCH] #
---
/dev/null | 235 -----------------------
src/main/webapp/views/pda/index.html | 1
src/main/webapp/views/pda/stockIn.html | 6
src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java | 2
src/main/java/zy/cloud/wms/common/model/MatnrDto.java | 15 +
src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java | 18 +
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 6
src/main/webapp/views/pda/pakin.html | 256 ++++++++++++------------
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 18 +
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 2
10 files changed, 190 insertions(+), 369 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java b/src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java
index 69c6de6..4889c8c 100644
--- a/src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java
+++ b/src/main/java/zy/cloud/wms/common/config/AdminInterceptor.java
@@ -97,7 +97,7 @@
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/java/zy/cloud/wms/common/model/MatnrDto.java b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
new file mode 100644
index 0000000..e5f4b3a
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.common.model;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/31
+ */
+@Data
+public class MatnrDto {
+
+ private String matnr;
+
+ private Double count;
+
+}
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 2307188..06f9fcf 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -41,6 +41,12 @@
@Autowired
private CustOrderService custOrderService;
+ @RequestMapping("/stock/pakin")
+ @ManagerAuth(memo = "鍏ュ簱")
+ public R stockPakin(@RequestBody PakinParam number) {
+ return workService.stockPakin(number, getUserId());
+ }
+
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
public R stockIn(@RequestBody StockInParam stockInParam) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
new file mode 100644
index 0000000..8c76126
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/PakinParam.java
@@ -0,0 +1,18 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+import zy.cloud.wms.common.model.MatnrDto;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2021/3/26
+ */
+@Data
+public class PakinParam {
+
+ private String nodeId;
+
+ private List<MatnrDto> mats;
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index feb8c9f..a2c2d56 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -7,6 +7,8 @@
public interface WorkService {
+ R stockPakin(PakinParam param, Long userId);
+
R stockIn(StockInParam param, Long userId);
R stockOutCheck(String number, Long userId);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 98d9b7a..e3e7c0b 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -8,6 +8,7 @@
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.config.CodeCoolException;
import zy.cloud.wms.common.model.BillDto;
+import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
@@ -55,6 +56,23 @@
@Override
@Transactional
+ public R stockPakin(PakinParam param, Long userId) {
+ Node node = nodeService.selectByUuid(param.getNodeId());
+ if (node == null) {
+ return R.error("璐т綅涓嶅瓨鍦�");
+ }
+ if (Cools.isEmpty(param.getMats())) {
+ return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
+ }
+ for (MatnrDto dto : param.getMats()) {
+
+
+ }
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @Override
+ @Transactional
public R stockIn(StockInParam param, Long userId) {
Node node = nodeService.selectByUuid(param.getNodeId());
if (node == null) {
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 3ca08e7..1d9a74c 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -76,6 +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="pakin" 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="stockCheck" onclick="nav(this.id)" class="nav-unselect" href="#">鐩樼偣</a></li>
</ul>
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/pakin.html
similarity index 62%
rename from src/main/webapp/views/pda/combPro.html
rename to src/main/webapp/views/pda/pakin.html
index 5a47eb1..d1cf31b 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/pakin.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>缁勬墭</title>
+ <title>鍏ュ簱</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -50,18 +50,29 @@
padding: 5px 20px;
color: darkred;
}
+
+ /**缁胯壊鍕�*/
+ #node-ok {
+ float: left;
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ margin-top: 13px;
+ background-color: #2ac845;
+ display: none;
+ }
</style>
</head>
<body>
<!-- 澶撮儴 -->
<header>
- <div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <div style="" class="layui-input-inline">
+ <label class="layui-form-label">鍏ュ簱璐т綅</label>
+ <input style="float: left" class="layui-input" type="text" id="node" onkeyup="findNode(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <span id="node-ok"></span>
</div>
- <div class="layui-input-inline" style="margin-top: 5px">
- <label class="layui-form-label">鍗曞彿</label>
- <input class="layui-input" id="billNo" onkeyup="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
+ <div style="margin: 5px 5px">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
</div>
</header>
@@ -73,20 +84,19 @@
<footer>
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="pakin()" style="margin-left: 20px">鍏ュ簱</button>
<span id="tips"></span>
</div>
</footer>
-
<!-- 淇敼鏁伴噺寮圭獥 -->
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
<div class="form-item">
<span>鐗╂枡</span>
- <input id="matNo" type="text" disabled="disabled" style="width: 70%">
+ <input id="matnr" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item">
<span>鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled" style="width: 70%">
+ <input id="maktx" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -99,9 +109,7 @@
</div>
</body>
<script>
- window.onload = function(){document.getElementById("code").focus();}
var tableIns;
- var countLayer;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -114,9 +122,9 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -135,8 +143,8 @@
area: ['80%', '200px'],
content: $("#modify"),
success: function (layero, index) {
- $('#matNo').val(data.matNo);
- $('#matName').val(data.matName);
+ $('#matnr').val(data.matnr);
+ $('#maktx').val(data.maktx);
$('#count').val(data.count);
maxCount = data.count;
}
@@ -147,58 +155,114 @@
});
- function findCode(el) {
- if (el.value.length === 7) {
- $('#billNo').focus();
- }
- }
-
- // 娣诲姞琛ㄦ牸鏁版嵁
- var matData = [];
- function addTableData(data) {
- for (var i=0;i<data.length;i++) {
- var toPush = true;
- for (var j=0;j<matData.length;j++){
- if (data[i].matNo === matData[j].matNo) {
- matData[j].count = Number(matData[j].count) + Number(data[i].count);
- toPush = false;
- }
- }
- if (toPush) {
- matData.push(data[i]);
- }
- }
- tableIns.reload({data: matData});
- $("#comb-btn").focus();
- }
-
-
- /**
- * 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
- */
- function find(el){
+ function findNode(el) {
if (isEmpty(el.value)) {
+ $('#node-ok').hide();
return;
}
$.ajax({
- url: baseUrl + "/mobile/bill/query/auth",
+ url: baseUrl + "/mobile/inStock/node/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: el.value
+ node: el.value
},
method: 'POST',
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- addTableData(res.data);
+ $('#node-ok').show();
+ } else {
+ $('#node-ok').hide();
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- tips(res.msg, true)
+ tips(res.msg, true);
}
}
})
+ }
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鎻愬彇鍟嗗搧',
+ shade: [0.3,'#000'],
+ area: ['90%', '80%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ if (isEmpty(data.maktx)){
+ tips("鎻愬彇澶辫触", true);
+ return;
+ }
+ var toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matnr === matData[j].matnr) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#node').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ $('#node-ok').hide();
+ }
+
+ // 鍏ュ簱
+ function pakin() {
+ layer.confirm('褰撳墠鐗╂枡寮�濮嬪叆搴擄紵', {shadeClose: true}, function(){
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/work/stock/pakin",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ nodeId: node,
+ mats: matData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("鍏ュ簱鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ });
}
/************************************* 鏁伴噺 ****************************************/
@@ -206,9 +270,9 @@
var minCount = 1;
var maxCount = 1;
function add() {
- if (countDom.val() >= maxCount) {
- return;
- }
+ // if (countDom.val() >= maxCount) {
+ // return;
+ // }
countDom.val(Number(countDom.val()) + 1);
}
function reduce() {
@@ -220,11 +284,12 @@
// 淇敼鏁伴噺
function confirm(){
- var matNo = $('#matNo').val();
+ var matnr = $('#matnr').val();
var count = $('#count').val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
- if (count > maxCount || count < minCount) {
+ if (matnr === matData[j].matnr) {
+ // if (count > maxCount || count < minCount) {
+ if (count < minCount) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
return;
}
@@ -238,82 +303,15 @@
// 绉婚櫎鐗╂枡
function remove() {
- var matNo = $('#matNo').val();
+ var matnr = $('#matnr').val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matnr === matData[j].matnr) {
matData.splice(j, 1);
}
}
tableIns.reload({data: matData});
layer.close(countLayer);
tips("绉婚櫎鎴愬姛");
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- // 閲嶇疆
- function reset() {
- $('#code').val("");
- $('#billNo').val("");
- matData = [];
- tableIns.reload({data: matData});
- }
-
- // 缁勬墭
- function comb() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- // document.getElementById("code").focus();
- return;
- }
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
- return;
- }
- if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
- }
- var billNo = $('#billNo').val();
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- combMats: matData,
- billNo: billNo
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("缁勬墭鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
- }
- })
}
/**
@@ -333,8 +331,8 @@
$("#comb-btn").focus();
comb();
} else if (key === 113) {
- $("#code").val("");
- $("#code").focus();
+ $("#node").val("");
+ $("#node").focus();
}
}
</script>
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 868b191..8341bdc 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>鍏ュ簱</title>
+ <title>涓婃灦</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -128,7 +128,6 @@
document.getElementById("code").focus();
}
-
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -197,7 +196,6 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- // $('#pakin').focus();
$('#node-ok').show();
} else {
$('#node-ok').hide();
@@ -205,7 +203,7 @@
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- alert(res.msg)
+ tips(res.msg, true);
}
}
})
diff --git a/src/main/webapp/views/pda/stockInPro.html b/src/main/webapp/views/pda/stockInPro.html
deleted file mode 100644
index 34d839c..0000000
--- a/src/main/webapp/views/pda/stockInPro.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>鍏ュ簱</title>
- <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../static/css/pda.css" media="all">
- <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
- <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <style>
- .site-list {
- padding: 2px 0;
- height: 22px;
- margin-bottom: 5px;
- }
- .site-list label {
- padding-right: 15px;
- }
- .site-list label span {
- vertical-align: middle;
- font-size: 13px;
- }
-
- .cool-checkbox:checked {
- background:#1673ff
- }
- .cool-checkbox {
- width:15px;
- height:15px;
- background-color:#ffffff;
- border:solid 1px #dddddd;
- -webkit-border-radius:50%;
- border-radius:50%;
- font-size:15px;
- margin:0 5px 0 0;
- padding:0;
- position:relative;
- display:inline-block;
- vertical-align:middle;
- cursor:default;
- -webkit-appearance:none;
- -webkit-user-select:none;
- user-select:none;
- -webkit-transition:background-color ease 0.1s;
- transition:background-color ease 0.1s;
- }
- .cool-checkbox:checked::after {
- content:'';
- top:3px;
- left:3px;
- position:absolute;
- background:transparent;
- border:#fff solid 2px;
- border-top:none;
- border-right:none;
- height:3px;
- width:6px;
- -moz-transform:rotate(-45deg);
- -ms-transform:rotate(-45deg);
- -webkit-transform:rotate(-45deg);
- transform:rotate(-45deg);
- }
-
- </style>
-</head>
-<body>
-<!-- 澶撮儴 -->
-<header>
- <div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
- </div>
- <div class="layui-input-inline" style="margin-top: 20px">
- <label class="layui-form-label">鎴愬搧</label>
- <input class="layui-input" type="number" id="matCode" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
- </div>
- <div style="margin-top: 20px" class="layui-form">
- <label class="layui-form-label">鍏ュ簱鍙�</label>
- <!-- 鍏ュ簱鍙� -->
- <div class="layui-inline" style="width: 120px; margin-left: 15px">
- <select id="putSiteSelect">
- <option value="">鍏ュ簱鍙�</option>
- </select>
- </div>
- </div>
-
-</header>
-
-<!-- 涓讳綋 -->
-<!--<main>-->
-<!-- <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>-->
-<!--</main>-->
-<!-- 灏鹃儴 -->
-<footer style="margin-top: 30px">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">鍏ュ簱</button>
- </div>
-</footer>
-</body>
-<script>
- window.onload = function(){
- document.getElementById("code").focus();
- getInBound();
- }
-
-
- layui.use(['table','laydate', 'form'], function() {
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var form = layui.form;
-
-
- });
-
- function findCode(el) {
- if (el.value.length === 7) {
- $('#matCode').focus();
- }
- }
-
- // 鑾峰彇鍏ュ簱鍙�
- function getInBound(){
- $.ajax({
- url: baseUrl+"/available/put/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- var tpl = $("#putSiteSelectTemplate").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#putSiteSelect').append(html);
- layui.form.render('select');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/pda";
- }else {
- tips("鑾峰彇鍏ュ簱鍙ｅけ璐�", true)
- }
- }
- })
- }
-
- // 閲嶇疆
- function reset() {
- $('#code').val("");
- $('#matCode').val("");
- $('#putSiteSelect').val("");
- layui.form.render('select');
- // tips("");
- }
-
- // 鍏ュ簱
- function pakIn() {
- var barcode = $('#code').val();
- var matCode = $('#matCode').val();
- if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- return;
- }
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
- return;
- }
- if (isEmpty(matCode)) {
- tips("鎴愬搧鐮佷负绌�", true);
- return;
- }
- // var site = $('input:radio[name="site"]:checked').next("span").html();
- var site = $('#putSiteSelect').val();
- if (null === site || undefined === site || site === "") {
- tips("璇烽�夋嫨鍏ュ簱鍙�", true);
- return;
- }
- $.ajax({
- url: baseUrl+"/full/store/put/start",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- devpNo: site,
- productCode: matCode
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("鍏ュ簱鍚姩鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
- }
- })
- }
-
- /**
- * 鎻愮ず淇℃伅
- * @param msg 鎻愮ず鍐呭
- * @param warn true锛氱孩鑹插瓧浣�
- */
- function tips(msg, warn) {
- // let tips = $('#tips');
- // tips.html(msg);
- // tips.css("color", warn?"red":'#666');
- layer.msg(msg, {icon: warn?2:1})
- }
-
- document.onkeyup = function (e) {
- if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
- e = window.event;
- var key = e.charCode || e.keyCode;
- if (key === 115) {
- $("#pakin").focus();
- pakIn();
- } else if (key === 113) {
- $("#code").val("");
- $("#code").focus();
- }
- }
-</script>
-<script type="text/template" id="putSiteSelectTemplate">
- {{#each data}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
-</script>
-</html>
\ No newline at end of file
--
Gitblit v1.9.1