From ef7acb8c892d18b263efdfb1fe7bcddb9b1d3085 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 15:17:06 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/matQuery.html | 54 +++++++++++++++++
src/main/webapp/views/custOrder/custOrder.html | 2
src/main/webapp/static/js/ioWorks/matQuery.js | 88 +++++++++++++++++++++--------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 18 +++++
4 files changed, 134 insertions(+), 28 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 7c826d2..48220e5 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -5,18 +5,21 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.InitPakoutParam;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
+import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
import zy.cloud.wms.manager.service.WrkStsService;
@@ -36,6 +39,10 @@
private PakoutService pakoutService;
@Autowired
private WrkStsService wrkStsService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private CustOrderService custOrderService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -100,7 +107,6 @@
return workService.initPakout(params, getUserId());
}
-
@RequestMapping("/hand/control/pakout")
@ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
@@ -112,4 +118,14 @@
return R.ok();
}
+ @RequestMapping("/orderNo/init")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+ public R initOrderNo() {
+ long nextId = snowflakeIdWorker.nextId();
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
+ return R.error("鎶辨瓑杩愭皵涓嶅ソ锛岃鍐嶇敓鎴愪竴娆�");
+ }
+ return R.ok().add(String.valueOf(nextId));
+ }
+
}
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index 390e731..ed49f52 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -20,6 +20,7 @@
elem: '#chooseData',
headers: {token: localStorage.getItem('token')},
data: [],
+ limit: 100,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -38,34 +39,48 @@
table.on('toolbar(chooseData)', function (obj) {
var data = matData;
switch (obj.event) {
- case 'outbound':
+ case 'createDoc':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞鐗╂枡');
+ layer.msg('璇锋坊鍔犵墿鏂�');
} else {
- var locDetls = [];
- data.forEach(function(elem) {
- locDetls.push({nodeId: elem.nodeId, matnr: elem.matnr, count: elem.count});
+
+ layer.open({
+ type: 1,
+ title: '瀹氫箟閿�鍞崟缂栧彿',
+ offset: '100px',
+ area: ['360px'],
+ shade: 0.1,
+ content: $('#getOrderNo'),
+ success: function(layero, index){
+ layer.iframeAuto(index)
+ },
});
- $.ajax({
- url: baseUrl+"/work/pakout/init",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(locDetls),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- matData = [];
- tableIns.reload({data: matData,done:function (res) {
- limit();
- }});
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- });
+
+
+ // var matDetls = [];
+ // data.forEach(function(elem) {
+ // matDetls.push({matnr: elem.matnr, count: elem.count});
+ // });
+ // $.ajax({
+ // url: baseUrl+"/work/pakout/init",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(matDetls),
+ // contentType:'application/json;charset=UTF-8',
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code === 200){
+ // matData = [];
+ // tableIns.reload({data: matData,done:function (res) {
+ // limit();
+ // }});
+ // layer.msg(res.msg, {icon: 1});
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // } else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // });
}
break;
}
@@ -87,6 +102,11 @@
break;
}
});
+
+ // 寮�濮嬫墦鍗�
+ form.on('submit(confirm)', function (data) {
+
+ })
function updateMatData(locNo, matnr, count) {
if (isNaN(count)) {
@@ -149,4 +169,22 @@
matData.push.apply(matData, data);
tableIns.reload({data: matData});
layer.close(matDetlLayerIdx);
+}
+
+function initOrderNo() {
+ $.ajax({
+ url: baseUrl+"/work/orderNo/init",
+ headers: {'token': localStorage.getItem('token')},
+ async: false,
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ $('#orderNo').val(res.data)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
}
\ No newline at end of file
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 3ac9eb2..318fe15 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -33,7 +33,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn" onclick="right()">鏃爅s鍙充晶寮瑰嚭</button>
+ <button class="layui-btn" onclick="right()">鑷畾涔夐攢鍞崟</button>
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
diff --git a/src/main/webapp/views/custOrder/matQuery.html b/src/main/webapp/views/custOrder/matQuery.html
index a4ffe19..f514f77 100644
--- a/src/main/webapp/views/custOrder/matQuery.html
+++ b/src/main/webapp/views/custOrder/matQuery.html
@@ -71,6 +71,44 @@
color: #fff;
}
+ /* 閿�鍞崟缂栧彿 */
+ #getOrderNo .layui-form {
+ padding: 25px 30px 0 0;
+ }
+ #getOrderNo .layui-form-label {
+ padding: 8px 15px;
+ box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ }
+ #getOrderNo .layui-form-required:before {
+ content: "*";
+ display: inline-block;
+ font-family: SimSun,serif;
+ margin-right: 4px;
+ font-size: 14px;
+ line-height: 1;
+ color: #ed4014;
+ }
+ #getOrderNo .layui-input {
+ height: 36px;
+ border-radius: 4px;
+ }
+ #getOrderNo .cool-button-contain {
+ text-align: right;
+ margin: 20px 0;
+ }
+ #getOrderNo .layui-form-radio>i:hover, .layui-form-radioed>i {
+ color: #007bff;
+ }
+ #getOrderNo .layui-btn {
+ height: 36px;
+ line-height: 36px;
+ border-radius: 4px;
+ box-shadow: 0 1px 0 rgba(0,0,0,.03);
+ }
+ #getOrderNo .layui-btn-primary:hover {
+ border-color: #777777;
+ }
</style>
</head>
<body>
@@ -90,7 +128,7 @@
<div class="layui-form">
<div class="layui-btn-container">
<!-- 2.鍚姩鍑哄簱 -->
- <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
+ <button class="layui-btn layui-btn-lg layui-btn-normal" id="btn-outbound" lay-event="createDoc">鐢熸垚閿�鍞崟</button>
</div>
</div>
</script>
@@ -110,6 +148,20 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/ioWorks/matQuery.js" charset="utf-8"></script>
+<div id="getOrderNo" style="display: none">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍗曟嵁缂栧彿:</label>
+ <div class="layui-input-block">
+ <input id="orderNo" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item cool-button-contain">
+ <button class="layui-btn layui-btn-normal" id="autoNo" onclick="initOrderNo()">鑷姩鐢熸垚</button>
+ <button class="layui-btn layui-btn-primary" id="confirm" lay-filter="confirm" lay-submit="">纭畾</button>
+ </div>
+ </div>
+</div>
</body>
</html>
--
Gitblit v1.9.1