From 064ef1fd2858c6185bd1b7d1e986fc08c7abd8aa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 15:50:10 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/param/PakinMatDto.java | 15 +++++++
src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java | 17 ++++++++
src/main/webapp/static/js/ioWorks/matQuery.js | 52 ++++++++++++--------------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 11 +++--
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 11 +++--
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 7 +--
6 files changed, 73 insertions(+), 40 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 48220e5..299974e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -15,10 +15,7 @@
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.entity.param.*;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
@@ -128,4 +125,10 @@
return R.ok().add(String.valueOf(nextId));
}
+ @RequestMapping("/order/init")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ public R initOrder(@RequestBody InitOrderParam param) {
+ return workService.initOrder(param, getUserId());
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java
new file mode 100644
index 0000000..25ff509
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java
@@ -0,0 +1,17 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2021/3/10
+ */
+@Data
+public class InitOrderParam {
+
+ private String number;
+
+ private List<PakinMatDto> list;
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/PakinMatDto.java b/src/main/java/zy/cloud/wms/manager/entity/param/PakinMatDto.java
new file mode 100644
index 0000000..c6cc263
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/PakinMatDto.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/11
+ */
+@Data
+public class PakinMatDto {
+
+ private String matnr;
+
+ private Double count;
+
+}
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 7351e80..d0f133f 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,10 +1,7 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
-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.entity.param.*;
import java.util.List;
@@ -26,4 +23,6 @@
R cancelPakout(String wrkNo, Long userId);
+ R initOrder(InitOrderParam 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 7266714..09cbc88 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
@@ -12,10 +12,7 @@
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
-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.entity.param.*;
import zy.cloud.wms.manager.entity.result.StoPrintVo;
import zy.cloud.wms.manager.service.*;
@@ -213,4 +210,10 @@
return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
+ @Override
+ @Transactional
+ public R initOrder(InitOrderParam param, Long userId) {
+ return null;
+ }
+
}
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index 0a22b7c..e0703ac 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -43,7 +43,6 @@
if (data.length === 0){
layer.msg('璇锋坊鍔犵墿鏂�');
} else {
-
layer.open({
type: 1,
title: '瀹氫箟閿�鍞崟缂栧彿',
@@ -58,32 +57,6 @@
$('#orderNo').val('');
}
});
-
-
- // 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;
}
@@ -108,8 +81,31 @@
// 寮�濮嬬敓鎴愭嫞璐у崟
form.on('submit(confirm)', function (data) {
+ var matDetls = [];
+ matData.forEach(function(elem) {
+ matDetls.push({matnr: elem.matnr, count: elem.count});
+ });
+ $.ajax({
+ url: baseUrl+"/work/order/init",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ number: data.field.orderNo,
+ list: matDetls
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ top.layui.layer.close(top.popupRight);
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
- top.layui.layer.close(top.popupRight);
})
function updateMatData(locNo, matnr, count) {
--
Gitblit v1.9.1