From d5dfa0ea027ee9f09ffd22911f74e859b97bc4d4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 08:19:02 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 4 ++--
src/main/webapp/static/js/custOrder/custOrder.js | 24 +++++++++++++++++++++++-
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 8 +++++++-
src/main/java/zy/cloud/wms/manager/entity/param/StockOutParam.java | 14 ++++++++++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 6 ++++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 3 +++
6 files changed, 55 insertions(+), 4 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 e73fa8e..d661097 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.WorkService;
/**
@@ -22,9 +23,14 @@
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
- public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
+ public R stockIn(@RequestBody StockInParam stockInParam) {
return workService.stockIn(stockInParam, getUserId());
}
+ @RequestMapping("/stock/out")
+ @ManagerAuth(memo = "鎷ｈ揣")
+ public R stockOut(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOut(stockOutParam, getUserId());
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/StockOutParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/StockOutParam.java
new file mode 100644
index 0000000..bef4792
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/StockOutParam.java
@@ -0,0 +1,14 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/2/25
+ */
+@Data
+public class StockOutParam {
+
+ // 閿�鍞鍗曞彿
+ 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 a4cb2b4..e022bdf 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -2,9 +2,12 @@
import com.core.common.R;
import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.entity.param.StockOutParam;
public interface WorkService {
R stockIn(StockInParam param, Long userId);
+ R stockOut(StockOutParam 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 34293ea..047063b 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,6 +12,7 @@
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.CombService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.NodeService;
@@ -74,4 +75,9 @@
return R.ok();
}
+ @Override
+ public R stockOut(StockOutParam param, Long userId) {
+ return null;
+ }
+
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 11b4b9e..fb5fccd 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -33,7 +33,7 @@
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
@@ -179,6 +179,28 @@
table.on('tool(custOrder)', function(obj){
var data = obj.data;
switch (obj.event) {
+ // 鎷ｈ揣
+ case 'stockOut':
+ layer.confirm(data.number + ' 璁㈠崟鎷ｈ揣', {shadeClose: true}, function(){
+ layer.closeAll();
+ });
+ // layer.open({
+ // type: 2,
+ // title: data.number + ' 璁㈠崟鎷ｈ揣',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // shadeClose: true,
+ // content: 'custOrder_detail.html',
+ // success: function(layero, index){
+ // setFormVal(layer.getChildFrame('#detail', index), data, true);
+ // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ // layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ // layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ // }
+ // });
+ break;
// 璇︽儏
case 'detail':
layer.open({
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 60c0885..ed80ba3 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -40,8 +40,8 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</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>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1