From ebae1580228ed849f26805dbd0ade1b44d80091f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 三月 2021 13:39:23 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockOut.html | 35 ++++++-----------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 7 +++
src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java | 15 +++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 8 ++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 3 +
5 files changed, 46 insertions(+), 22 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 8ee9867..700dd2e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -13,6 +13,7 @@
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
+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.PakoutService;
@@ -80,4 +81,10 @@
);
}
+ @RequestMapping("/stock/out/confirm")
+ @ManagerAuth(memo = "鎹¤揣纭")
+ public R stockOutConfirm(@RequestBody StockConfirmParam param) {
+ return workService.stockOutComplete(param, getUserId());
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
new file mode 100644
index 0000000..80eeb5d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/3
+ */
+@Data
+public class StockConfirmParam {
+
+ private String wrkNo;
+
+ private String number;
+
+}
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 a95b921..6aa88ca 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,6 +1,7 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
+import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -12,4 +13,6 @@
R stockOut(StockOutParam param, Long userId);
+ R stockOutComplete(StockConfirmParam param, 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 79b124b..7b249a1 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
@@ -14,6 +14,7 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
+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.*;
@@ -98,4 +99,11 @@
return R.ok();
}
+ @Override
+ public R stockOutComplete(StockConfirmParam param, Long userId) {
+
+
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 514b95c..ae66f6b 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -139,7 +139,6 @@
})
}
-
layui.use(['laydate', 'form'], function() {
var $ = layui.jquery;
var layer = layui.layer;
@@ -147,33 +146,25 @@
});
-
// 鎷ｈ揣纭
function pakoutConfirm() {
- var tableData = layui.table.checkStatus('tableIdx').data;
- if (tableData.length === 0) {
- tips("璇烽�夋嫨鐗╂枡", true);
- return;
- }
- var site = $('#staNoSelect').val();
- if (null === site || undefined === site || site === "") {
- tips("璇烽�夋嫨鍑哄簱鍙�", true);
+ var docNum = pakoutData[0].docNum;
+ if (isEmpty(docNum)) {
+ tips("璇风‘璁ゅ崟鎹紪鍙凤紒", true);
return;
}
$.ajax({
- url: baseUrl+"/plate/out/start",
+ url: baseUrl+"/work/stock/out/confirm",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- outSite: site,
- locDetls: tableData
+ number: docNum
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
- async: false,
success: function (res) {
if (res.code === 200) {
reset();
- tips("鍚姩鍑哄簱鎴愬姛")
+ tips("鎹¤揣鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
@@ -183,15 +174,15 @@
})
}
-
-
// 閲嶇疆
function reset() {
- $("#matNo").val("");
- $("#locNo").val("");
- locDetlData = [];
- tableIns.reload({data: locDetlData});
- $('#staNoSelect').val("");
+ $("#docNum").val("");
+ $('#status').html("鏈煡");
+ $('#status').attr("class", "layui-form-label status-0");
+ $('#custName').html("-");
+ $('#pakout-box').html("");
+ pakoutData = [];
+ document.getElementById("docNum").focus();
layui.form.render('select');
}
--
Gitblit v1.9.1