From bea1bbc1c84bd9091e00ac49403dcc6df152f0a8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 二月 2021 10:46:10 +0800
Subject: [PATCH] #出库（二期）
---
src/main/webapp/static/js/pakStore/stockOut0.js | 14 +-
src/main/webapp/views/pakStore/locDetlQuery0.html | 226 +++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/WorkController.java | 41 +++++--
src/main/webapp/static/js/pakStore/stockOut.js | 2
4 files changed, 261 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 49c905b..e593ecf 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -10,10 +10,7 @@
import com.zy.asrs.service.WorkService;
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 org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -44,23 +41,39 @@
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
- @RequestMapping("/available/take/site")
+ @RequestMapping("/available/take/site/{type}")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
- public R availableTakeSite(){
+ public R availableTakeSite(@PathVariable("type") Integer type){
List<Map<String, Object>> result = new ArrayList<>();
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (Integer siteId : outSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
- result.add(map);
+ if (type == 2 && siteId > 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
+ if (type == 1 && siteId < 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
}
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
- Map<String, Object> map = new HashMap<>();
- map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
- result.add(map);
+ if (type == 2 && siteId > 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
+ if (type == 1 && siteId < 10) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝嚭搴撳彛锛�");
+ result.add(map);
+ }
}
return R.ok().add(result);
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 6c08a87..5165a6c 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -121,7 +121,7 @@
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
$.ajax({
- url: baseUrl+"/available/take/site",
+ url: baseUrl+"/available/take/site/1",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
diff --git a/src/main/webapp/static/js/pakStore/stockOut0.js b/src/main/webapp/static/js/pakStore/stockOut0.js
index 6c08a87..0d05eb9 100644
--- a/src/main/webapp/static/js/pakStore/stockOut0.js
+++ b/src/main/webapp/static/js/pakStore/stockOut0.js
@@ -2,13 +2,13 @@
var locDetlData = [];
function getCol() {
var cols = [
- // {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- {field: 'anfme', align: 'center',title: '鏁伴噺'}
+ {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
- // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
}
@@ -43,7 +43,7 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
+ layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -121,7 +121,7 @@
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
$.ajax({
- url: baseUrl+"/available/take/site",
+ url: baseUrl+"/available/take/site/2",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
@@ -142,7 +142,7 @@
}
})
-// 鎻愬彇浜у搧
+// 鎻愬彇鐗╂枡
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
@@ -151,7 +151,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'locDetlQuery.html',
+ content: 'locDetlQuery0.html',
success: function(layero, index){
}
});
diff --git a/src/main/webapp/views/pakStore/locDetlQuery0.html b/src/main/webapp/views/pakStore/locDetlQuery0.html
new file mode 100644
index 0000000..d6a2c61
--- /dev/null
+++ b/src/main/webapp/views/pakStore/locDetlQuery0.html
@@ -0,0 +1,226 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ body {
+ padding: 0 20px;
+ }
+ .layui-table-box {
+ border-right: 1px solid #9F9F9F;
+ border-left: 1px solid #9F9F9F;
+ }
+
+ #search-box {
+ padding: 30px 0 20px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+ </style>
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+ <legend>鎼滅储鏍�</legend>
+ <!-- 鎼滅储鏍� -->
+ <div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ </div>
+ </div>
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+ </div>
+</fieldset>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+ </div>
+</script>
+
+<div class="layui-form">
+ <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+
+</body>
+<script>
+
+ var pageCurr;
+ function getCol() {
+ var cols = [
+ {type: 'checkbox'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ return cols;
+ }
+
+ layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ // 鏁版嵁娓叉煋
+ locDetlTableIns = table.render({
+ elem: '#stockOut',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/stock/out/list/auth',
+ page: true,
+ limit: 10,
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(stockOut)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ var data = checkStatus.data;
+ switch(obj.event) {
+ case 'confirm':
+ if (data.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ parent.addTableData(data);
+ break;
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload();
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload();
+ });
+
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ })
+
+ function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ locDetlTableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ locDetlTableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ }
+ });
+ }
+
+ function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+ }
+</script>
+</html>
+
--
Gitblit v1.9.1