From 2b8da361b039e8b85b095b3261310be2a37618b8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 15:20:56 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 2 +-
src/main/webapp/static/js/custOrder/custOrder.js | 24 +++++++++++++++++++++++-
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 20 ++++++++++++++++++++
src/main/java/zy/cloud/wms/common/utils/VersionUtils.java | 2 --
src/main/java/zy/cloud/wms/common/service/MainService.java | 4 +++-
5 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index e26ea1f..07af77b 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -68,6 +68,8 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
+// pakout.setDocId(custOrder.getBTypeId());
+ pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
pakout.setStatus(1);
@@ -78,7 +80,7 @@
if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued)) {
throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
}
- // 鍓╀綑寰呭嚭璐т綅閫掑噺
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
}
diff --git a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
index 562a5f6..f0d0ecd 100644
--- a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
+++ b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
@@ -55,8 +55,6 @@
pakout.setBatch(mat.getBatch());
pakout.setUnit(mat.getUnit());
pakout.setBarcode(mat.getBarcode());
- pakout.setDocId(mat.getDocId());
- pakout.setDocNum(mat.getDocNum());
pakout.setCustName(mat.getCustName());
pakout.setItemNum(mat.getItemNum());
pakout.setCount(mat.getCount());
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 52f64d2..dd78dc7 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,9 +9,13 @@
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.Pakout;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
+import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
+
+import java.util.List;
/**
* Created by vincent on 2021/2/25
@@ -21,6 +26,8 @@
@Autowired
private WorkService workService;
+ @Autowired
+ private PakoutService pakoutService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -40,4 +47,17 @@
return workService.stockOut(stockOutParam, getUserId());
}
+ @RequestMapping("/stock/allot")
+ @ManagerAuth(memo = "搴撳瓨璋冩嫧")
+ public R stockAllot() {
+ return R.ok();
+ }
+
+ @RequestMapping("/pakout/get")
+ @ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
+ public R getPakout(@RequestParam String docNumber) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
+ return R.ok().add(pakouts);
+ }
+
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index f0901c8..17e179b 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",
@@ -250,6 +250,28 @@
}
});
+ // 鎵撳嵃鎹¤揣鍗�
+ function printPakouts(docNumber) {
+ $.ajax({
+ url: baseUrl+"/work/pakout/get",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ docNumber: docNumber
+ },
+ method: 'POST',
+ success: function (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.close(index);
+ }
+ })
+ }
+
// 鏁版嵁淇濆瓨鍔ㄤ綔
form.on('submit(save)', function () {
if (banMsg != null){
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index ed80ba3..5c1e37d 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -40,7 +40,7 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-xs" lay-event="stockOut">鎷ｈ揣</a>
+ <a class="layui-btn layui-btn-xs" lay-event="stockOut">寮�濮嬫崱璐�</a>
<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
</script>
--
Gitblit v1.9.1