From d4e17a37b2c13ab13123fc373d25ffbedfc5f0e7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 六月 2020 14:25:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 17 +++++++-
src/main/java/com/zy/asrs/controller/MatCodeController.java | 1
src/main/webapp/views/pda/stockIn.html | 54 ++++++++++++++++++++++----
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 +-
src/main/webapp/static/css/pda.css | 5 ++
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 8 ++--
src/main/webapp/static/js/pakStore/pakStore.js | 2
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 2
src/main/webapp/views/pda/matQuery.html | 1
11 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index fdc111d..eb4abbe 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -50,7 +50,6 @@
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
-
@RequestMapping(value = "/matCode/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 592f751..cf738da 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -7,12 +7,12 @@
private String matNo;
- private int count;
+ private Double count;
public MatCodeCountDto() {
}
- public MatCodeCountDto(String matNo, int count) {
+ public MatCodeCountDto(String matNo, Double count) {
this.matNo = matNo;
this.count = count;
}
@@ -25,11 +25,11 @@
this.matNo = matNo;
}
- public int getCount() {
+ public Double getCount() {
return count;
}
- public void setCount(int count) {
+ public void setCount(Double count) {
this.count = count;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index de82fa3..289ba63 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -7,6 +7,9 @@
*/
public class FullStoreParam {
+ // 鎵樼洏鏉＄爜
+ private String barcode;
+
// 绔欑偣缂栧彿
private Integer devpNo;
@@ -19,7 +22,7 @@
private String matNo;
// 鐗╂枡鏁伴噺
- private Integer count;
+ private Double count;
public String getMatNo() {
return matNo;
@@ -29,15 +32,23 @@
this.matNo = matNo;
}
- public Integer getCount() {
+ public Double getCount() {
return count;
}
- public void setCount(Integer count) {
+ public void setCount(Double count) {
this.count = count;
}
}
+ public String getBarcode() {
+ return barcode;
+ }
+
+ public void setBarcode(String barcode) {
+ this.barcode = barcode;
+ }
+
public Integer getDevpNo() {
return devpNo;
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 3e23f9a..13ed68b 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -8,6 +8,6 @@
public interface WrkDetlService extends IService<WrkDetl> {
- void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, Long userId);
+ void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, String barcode, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 0f62468..aab1e09 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -93,7 +93,7 @@
param.getList().forEach(elem -> {
matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount()));
});
- wrkDetlService.createWorkDetail(workNo, matDtos, userId);
+ wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 536b2ea..fe31337 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -24,7 +24,7 @@
@Override
@Transactional
- public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, Long userId) {
+ public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, String barcode, Long userId) {
if (matCodeCountDtos.isEmpty()){
return;
}
@@ -38,7 +38,8 @@
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- wrkDetl.setAnfme((double) dto.getCount()); // 鏁伴噺
+ wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setLgnum("寰呭畾"); // todo
wrkDetl.setTbnum(0); // todo
wrkDetl.setTbpos(0); // todo
diff --git a/src/main/webapp/static/css/pda.css b/src/main/webapp/static/css/pda.css
index 0e0ed19..74e60a2 100644
--- a/src/main/webapp/static/css/pda.css
+++ b/src/main/webapp/static/css/pda.css
@@ -72,6 +72,7 @@
footer {
position: absolute;
bottom: 5px;
+ width: 100%;
}
.layui-btn-container .layui-btn {
margin-left: 10px;
@@ -83,4 +84,8 @@
margin-left: 5px;
margin-bottom: 5px;
vertical-align: middle;
+}
+
+.layui-btn-primary:hover {
+ border-color: #C9C9C9
}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 2e2c251..1510b4a 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -64,7 +64,7 @@
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- devpNo: $('#putSiteSelect').val(),
+ devpNo: Number($('#putSiteSelect').val()),
list: matCodeData
}),
contentType:'application/json;charset=UTF-8',
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index f1cfa59..13c7f4d 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -25,7 +25,7 @@
// ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
// ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ // ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
// ,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 942ec78..541c4b4 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -112,6 +112,7 @@
*/
function find(el){
if (isEmpty(el.value)) {
+ alert(el.value)
return;
}
$.ajax({
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index f29a00f..44169ee 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -21,9 +21,9 @@
margin-bottom: 5px;
}
.site-list label {
- padding: 0 0 0 15px;
+ padding-right: 15px;
}
- .site-list span {
+ .site-list label span {
vertical-align: middle;
font-size: 13px;
}
@@ -90,9 +90,7 @@
<footer>
<!-- 鍏ュ簱鍙� -->
<div class="site-list">
- <label><input class="cool-checkbox" type="radio" name="site"><span>1</span></label>
- <label><input class="cool-checkbox" type="radio" name="site"><span>2</span></label>
- <label><input class="cool-checkbox" type="radio" name="site"><span>3</span></label>
+ <span style="display: inline-block; margin:0 0 0 10px; font-size: 12px">鍏ュ簱鍙ｏ細</span>
</div>
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
@@ -103,6 +101,11 @@
</body>
<script>
var tableIns;
+ window.onload = function(){
+ document.getElementById("code").focus();
+ getInBound();
+ }
+
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -125,8 +128,29 @@
});
- window.onload = function(){document.getElementById("code").focus();}
+ // 鑾峰彇鍏ュ簱鍙�
+ function getInBound(){
+ $.ajax({
+ url: baseUrl+"/available/put/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#inSitesTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('.site-list').append(html);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/pda";
+ }else {
+ tips("鑾峰彇鍏ュ簱鍙ｅけ璐�", true)
+ }
+ }
+ })
+ }
+ // 鎻愬彇鐗╂枡
var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
@@ -183,12 +207,19 @@
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
+ let site = $('input:radio[name="site"]:checked').next("span").html();
+ console.log(site);
+ if (null === site || undefined === site) {
+ tips("璇烽�夋嫨鍏ュ簱鍙�", true);
+ return;
+ }
$.ajax({
- url: baseUrl+"/mobile/comb/auth",
+ url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
- combMats: matData
+ devpNo: site,
+ list: matData
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -196,7 +227,7 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("缁勬墭鎴愬姛")
+ tips("鍚姩鍏ュ簱鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
@@ -217,4 +248,9 @@
tips.css("color", warn?"red":'#666');
}
</script>
+<script type="text/template" id="inSitesTemplate">
+ {{#each data}}
+ <label><input class="cool-checkbox" type="radio" name="site"><span>{{this}}</span></label>
+ {{/each}}
+</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1