From 24e3b2ff80aef47982603eb565892b77b8ac0899 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 六月 2020 16:32:47 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockOut.html | 60 ++++++++++---------
src/main/java/com/zy/common/model/MobileLocDetlVo.java | 47 +++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 41 +++++++++++++
3 files changed, 119 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8eadac7..87906fc 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,14 +1,26 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.MobileService;
+import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -20,6 +32,10 @@
@Autowired
private MobileService mobileService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
/**
* 缁勬墭
@@ -31,4 +47,29 @@
return R.ok();
}
+ /**
+ * 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
+ */
+ @RequestMapping("/locDetl")
+ @ManagerAuth
+ public R getLocDetl(@RequestParam(required = false)String locNo){
+ if (Cools.isEmpty(locNo)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ LocMast locMast = locMastService.selectById(locNo);
+ if (null == locMast || !"F".equals(locMast.getLocType())) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ List<MobileLocDetlVo> res = new ArrayList<>();
+ locDetls.forEach(locDetl -> {
+ MobileLocDetlVo vo = new MobileLocDetlVo();
+ vo.setLocNo(locNo);
+ vo.setMatNo(locDetl.getMatnr());
+ vo.setMatName(locDetl.getMaktx());
+ vo.setCount(locDetl.getAnfme());
+ res.add(vo);
+ });
+ return R.ok().add(res);
+ }
}
diff --git a/src/main/java/com/zy/common/model/MobileLocDetlVo.java b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
new file mode 100644
index 0000000..78a5701
--- /dev/null
+++ b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
@@ -0,0 +1,47 @@
+package com.zy.common.model;
+
+/**
+ * Created by vincent on 2020/6/29
+ */
+public class MobileLocDetlVo {
+
+ private String locNo;
+
+ private String matNo;
+
+ private String matName;
+
+ private Double count;
+
+ public String getLocNo() {
+ return locNo;
+ }
+
+ public void setLocNo(String locNo) {
+ this.locNo = locNo;
+ }
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public String getMatName() {
+ return matName;
+ }
+
+ public void setMatName(String matName) {
+ this.matName = matName;
+ }
+
+ public Double getCount() {
+ return count;
+ }
+
+ public void setCount(Double count) {
+ this.count = count;
+ }
+}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 4795bb0..14937cf 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -149,28 +149,52 @@
return;
}
$.ajax({
- url: baseUrl + "/matCode/auth",
+ url: baseUrl + "/mobile/locDetl",
headers: {'token': localStorage.getItem('token')},
data: {
- id: el.value
+ locNo: el.value
},
method: 'POST',
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#matName').val(res.data.matName);
- $('#str1').val(res.data.str1);
- $('#str2').val(res.data.str2);
- countDom.focus().val(initMatCount)
+ locDetlData = res.data;
+ tableIns.reload({data: locDetlData});
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- alert(res.msg)
+ locDetlData = [];
+ tableIns.reload({data: locDetlData});
}
}
})
}
+
+ var locDetlData = [];
+ var tableIns;
+ layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ tableIns = table.render({
+ elem: '#dataByLoc',
+ data: [],
+ limit: 500,
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox', fixed: 'left', width:30},
+ {field: 'count', align: 'center', title: '閲�', style:'color: blue', width:30},
+ {field: 'matNo', align: 'center', title: '缂栫爜'},
+ {field: 'matName', align: 'center', title: '鍚嶇О'},
+ {field: 'locNo', align: 'center', title: '搴撲綅'}
+ ]],
+ done: function (res, curr, count) {
+ }
+ });
+ });
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
@@ -193,28 +217,6 @@
}
})
}
-
- layui.use(['table','laydate', 'form'], function() {
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var form = layui.form;
-
- tableIns = table.render({
- elem: '#dataByLoc',
- data: [],
- limit: 500,
- cellMinWidth: 50,
- cols: [[
- {type: 'checkbox', fixed: 'left', width:30},
- {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:30},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
- ]],
- done: function (res, curr, count) {
- }
- });
- });
</script>
<script type="text/template" id="outSitesTemplate">
{{#each data}}
--
Gitblit v1.9.1