From 01f56e1480178f0ee3ce7d2a67a85b5dad94d204 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 三月 2021 14:13:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/custOrder/custOrder.js | 17 ++++++++++-------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 6 ++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 13 ++++++++++++-
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 2 ++
src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java | 13 +++++++++++++
5 files changed, 43 insertions(+), 8 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 700dd2e..412172f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -54,6 +54,12 @@
return workService.stockOut(stockOutParam, getUserId());
}
+ @RequestMapping("/stock/out/print")
+ @ManagerAuth(memo = "鎹¤揣鍗曟墦鍗�")
+ public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPrint(stockOutParam, getUserId());
+ }
+
@RequestMapping("/stock/allot")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockAllot() {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java b/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java
new file mode 100644
index 0000000..2ea98f0
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java
@@ -0,0 +1,13 @@
+package zy.cloud.wms.manager.entity.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/3
+ */
+@Data
+public class StoPrintVo {
+
+ private String docNum;
+
+}
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 6aa88ca..6229aee 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -11,6 +11,8 @@
R stockOutCheck(String number, Long userId);
+ R stockOutPrint(StockOutParam param, Long userId);
+
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 4d82483..9dface3 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
@@ -17,6 +17,7 @@
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.entity.result.StoPrintVo;
import zy.cloud.wms.manager.service.*;
import java.util.Date;
@@ -88,6 +89,14 @@
}
@Override
+ public R stockOutPrint(StockOutParam param, Long userId) {
+
+ StoPrintVo vo = new StoPrintVo();
+ vo.setDocNum(param.getNumber());
+ return R.ok().add(vo);
+ }
+
+ @Override
public R stockOut(StockOutParam param, Long userId) {
List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
.eq("number", param.getNumber())
@@ -105,7 +114,9 @@
@Transactional
public R stockOutComplete(StockConfirmParam param, Long userId) {
// 淇敼鍑哄簱鍗曠姸鎬�
- pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId);
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ return R.error("淇濆瓨鏁版嵁澶辫触");
+ }
// todo锛氫慨鏀瑰簱瀛樻暟閲�
return R.ok();
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 3c58f1b..e153007 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -199,6 +199,7 @@
, btn: ['鎵撳嵃鎹¤揣鍗�']
}, function() {
layer.closeAll();
+ printPakouts(data.number);
}
)
// 缂烘枡
@@ -207,8 +208,10 @@
shadeClose: true
, btn: ['搴撳瓨璋冩嫧', '鎵撳嵃']
}, function() {
+ // todo 搴撳瓨璋冩嫧
layer.closeAll();
}, function() {
+ printPakouts(data.number);
layer.closeAll();
}
)
@@ -217,7 +220,6 @@
} else {
layer.msg(res.msg)
}
- layer.close(index);
}
})
});
@@ -267,21 +269,22 @@
// 鎵撳嵃鎹¤揣鍗�
function printPakouts(docNumber) {
$.ajax({
- url: baseUrl+"/work/pakout/get",
+ url: baseUrl+"/work/stock/out/print",
headers: {'token': localStorage.getItem('token')},
- data: {
- docNumber: docNumber
- },
+ data: JSON.stringify({
+ number: docNumber
+ }),
+ contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
+ console.log(res)
if (res.code === 200){
alert(JSON.stringify(res.data));
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
- layer.close(index);
}
})
}
--
Gitblit v1.9.1