From 365a97f64f9f9db2151222c8041c5fa92a67a47a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 二月 2021 10:26:14 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 27 +++++--------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 30 +++++++++++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 20 ++++++++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 9 ++++
src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java | 15 +++++++
5 files changed, 85 insertions(+), 16 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
new file mode 100644
index 0000000..244e90c
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -0,0 +1,30 @@
+package zy.cloud.wms.manager.controller;
+
+import com.core.annotations.ManagerAuth;
+import com.core.common.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+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.service.WorkService;
+
+/**
+ * Created by vincent on 2021/2/25
+ */
+@RestController
+@RequestMapping("/work")
+public class WorkController extends BaseController {
+
+ @Autowired
+ private WorkService workService;
+
+ @RequestMapping("/stock/in")
+ @ManagerAuth(memo = "涓婃灦")
+ public R fullStorePutStart(@RequestBody StockInParam stockInParam) {
+ return R.ok("涓婃灦鎴愬姛").add(workService.stockIn(stockInParam, getUserId()));
+ }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java
new file mode 100644
index 0000000..b2abe53
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/StockInParam.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/2/25
+ */
+@Data
+public class StockInParam {
+
+ private Long nodeId;
+
+ private String zpallet;
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
new file mode 100644
index 0000000..f45393c
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -0,0 +1,9 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.param.StockInParam;
+
+public interface WorkService {
+
+ String stockIn(StockInParam 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
new file mode 100644
index 0000000..23e3801
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -0,0 +1,20 @@
+package zy.cloud.wms.manager.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.stereotype.Service;
+import zy.cloud.wms.manager.entity.param.StockInParam;
+import zy.cloud.wms.manager.service.WorkService;
+
+/**
+ * Created by vincent on 2021/2/25
+ */
+@Service("workService")
+public class WorkServiceImpl implements WorkService {
+
+
+ @Override
+ public String stockIn(StockInParam param, Long userId) {
+ System.out.println(JSON.toJSONString(param));
+ return null;
+ }
+}
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 1294a6b..5a0add0 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -148,6 +148,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data.length > 0) {
+ matData = res.data;
tableIns.reload({data: res.data});
$('#node').focus();
}
@@ -238,34 +239,28 @@
layui.form.render('select');
}
- // 鍏ュ簱
+ // 涓婃灦
function pakIn() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
tips("鎵樼洏鏉＄爜涓虹┖", true);
return;
}
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
return;
}
if (matData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
- // var site = $('input:radio[name="site"]:checked').next("span").html();
- var site = $('#putSiteSelect').val();
- if (null === site || undefined === site || site === "") {
- tips("璇烽�夋嫨鍏ュ簱鍙�", true);
- return;
- }
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/work/stock/in",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- barcode: barcode,
- devpNo: site,
- list: matData
+ nodeId: node,
+ zpallet: zpallet
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -273,7 +268,7 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("鍏ュ簱鍚姩鎴愬姛")
+ tips("涓婃灦鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
--
Gitblit v1.9.1