From 408f70e524beb80f555dcd2285cbddb979dbcf35 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 14:12:38 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locRule/locRule.html | 242 ++++++++++++++++------------------
src/main/webapp/static/js/locRule/locRule.js | 126 +++++++++++++-----
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 11
3 files changed, 210 insertions(+), 169 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index 1c8bf2b..329ceec 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -7,10 +7,7 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Node;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
@@ -43,6 +40,8 @@
private OrderDetlService orderDetlService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private LocRuleService locRuleService;
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -230,6 +229,8 @@
@Override
public List<String> getRemmendLoc(String matnr) {
- return this.baseMapper.getRommendLoc(matnr);
+ LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
+ this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
+ return
}
}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index f521632..cc9fa98 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -1,4 +1,5 @@
var pageCurr;
+var admin;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -7,7 +8,8 @@
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- var admin = layui.admin;
+ admin = layui.admin;
+
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -22,29 +24,28 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'matnr', align: 'center',title: ''}
- ,{field: 'specs', align: 'center',title: ''}
- ,{field: 'model', align: 'center',title: ''}
- ,{field: 'cstmr', align: 'center',title: ''}
- ,{field: 'batch', align: 'center',title: ''}
- ,{field: 'other', align: 'center',title: ''}
- ,{field: 'rowBeg', align: 'center',title: ''}
- ,{field: 'rowEnd', align: 'center',title: ''}
- ,{field: 'bayBeg', align: 'center',title: ''}
- ,{field: 'bayEnd', align: 'center',title: ''}
- ,{field: 'levBeg', align: 'center',title: ''}
- ,{field: 'levEnd', align: 'center',title: ''}
- ,{field: 'limit', align: 'center',title: ''}
- ,{field: 'status', align: 'center',title: ''}
- ,{field: 'createBy', align: 'center',title: ''}
- ,{field: 'createTime$', align: 'center',title: ''}
- ,{field: 'updateBy', align: 'center',title: ''}
- ,{field: 'updateTime$', align: 'center',title: ''}
- ,{field: 'memo', align: 'center',title: ''}
- ,{field: 'mixed$', align: 'center',title: '鏄惁鏀寔娣疯浇'}
- ,{field: 'keepGo$', align: 'center',title: '鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�'}
- ,{field: 'maktx', align: 'center',title: ''}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', hide: false}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
+ ,{field: 'cstmr', align: 'center',title: '瀹㈡埛', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide: true}
+ ,{field: 'other', align: 'center',title: '鍏朵粬', hide: true}
+ ,{field: 'rowBeg', align: 'center',title: '寮�濮嬫帓'}
+ ,{field: 'rowEnd', align: 'center',title: '缁撴潫鎺�'}
+ ,{field: 'bayBeg', align: 'center',title: '寮�濮嬪垪'}
+ ,{field: 'bayEnd', align: 'center',title: '缁撴潫鍒�'}
+ ,{field: 'levBeg', align: 'center',title: '寮�濮嬪眰'}
+ ,{field: 'levEnd', align: 'center',title: '缁撴潫灞�'}
+ ,{field: 'limit', align: 'center',title: '涓婇檺', hide: true}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ // ,{field: 'mixed$', align: 'center',title: '娣疯浇'}
+ ,{field: 'keepGo$', align: 'center',title: '缁х画鎼滅储'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -94,14 +95,14 @@
showEditModel();
break;
case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
case 'exportData':
admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
@@ -160,8 +161,8 @@
function showEditModel(mData) {
admin.open({
type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ area: '1000px',
+ title: (mData ? '淇敼' : '娣诲姞') + '搴撳尯瑙勫垯',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
@@ -193,6 +194,13 @@
}
});
}
+
+ // 瀵煎叆閿�鍞崟
+ $("#importOrder").click(function () {
+ $("#importExcel").trigger("click");
+ });
+
+
/* 鍒犻櫎 */
function del(ids) {
@@ -239,6 +247,11 @@
function layDateRender(data) {
setTimeout(function () {
layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
elem: '#createTime\\$',
type: 'datetime',
value: data!==undefined?data['createTime\\$']:null
@@ -268,5 +281,48 @@
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
- });
+ });
+}
+
+function uploadExcel(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭瀵煎叆 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/locRule/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
+function uploadComplete(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({page: {curr: 1}});
+ } else {
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
}
diff --git a/src/main/webapp/views/locRule/locRule.html b/src/main/webapp/views/locRule/locRule.html
index 1d44cf7..8debb59 100644
--- a/src/main/webapp/views/locRule/locRule.html
+++ b/src/main/webapp/views/locRule/locRule.html
@@ -18,9 +18,18 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" 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="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </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"> 
@@ -30,6 +39,10 @@
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
<i class="layui-icon"></i>閲嶇疆
</button>
+ <button id="importOrder" class="layui-btn icon-btn btn-add">
+ <i class="layui-icon layui-icon-upload"></i> 瀵煎叆瑙勫垯
+ </button>
+ <input style="display:none" id="importExcel" type="file" onchange="uploadExcel(this)" >
</div>
</div>
</div>
@@ -62,149 +75,120 @@
<form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
<input name="id" type="hidden">
<div class="layui-row">
- <div class="layui-col-md12">
+ <div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label">: </label>
+ <label class="layui-form-label">鍟嗗搧缂栧彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏�">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
</div>
</div>
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瑙勬牸: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍨嬪彿: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">瀹㈡埛: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">: </label>
+ <label class="layui-form-label">鍟嗗搧鍚嶇О: </label>
<div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏�">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
</div>
</div>
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鍏朵粬: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="other" placeholder="璇疯緭鍏ュ叾浠�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">涓婇檺: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="limit" placeholder="璇疯緭鍏ヤ笂闄�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">娣疯浇: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <select name="mixed">-->
+ <!-- <option value="1" selected>鏄�</option>-->
+ <!-- <option value="0">鍚�</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="model" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="batch" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="other" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="rowBeg" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="rowEnd" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bayBeg" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bayEnd" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="levBeg" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="levEnd" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="limit" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="status" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏄惁鏀寔娣疯浇: </label>
- <div class="layui-input-block">
- <select name="mixed">
- <option value="">璇烽�夋嫨鏄惁鏀寔娣疯浇</option>
- <option value="0">涓嶆敮鎸�</option>
- <option value="1">鏀寔</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�: </label>
+ <label class="layui-form-label">缁х画鎼滅储: </label>
<div class="layui-input-block">
<select name="keepGo">
- <option value="">璇烽�夋嫨鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�</option>
- <option value="0">鍚�</option>
<option value="1">鏄�</option>
+ <option value="0" selected>鍚�</option>
</select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="maktx" placeholder="璇疯緭鍏�">
</div>
</div>
- </div>
+ </div>
+
+ <div class="layui-col-md6">
+ <!-- <div class="layui-inline">-->
+ <!-- <label class="layui-form-label">鎺掕寖鍥�</label>-->
+ <!-- <div class="layui-input-inline" style="width: 100px;">-->
+ <!-- <input type="text" name="price_min" placeholder="锟�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-mid">-</div>-->
+ <!-- <div class="layui-input-inline" style="width: 100px;">-->
+ <!-- <input type="text" name="price_max" placeholder="锟�" autocomplete="off" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬫帓: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="rowBeg" placeholder="璇疯緭鍏ュ紑濮嬫帓" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫鎺�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="rowEnd" placeholder="璇疯緭鍏ョ粨鏉熸帓" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬪垪: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="bayBeg" placeholder="璇疯緭鍏ュ紑濮嬪垪" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫鍒�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="bayEnd" placeholder="璇疯緭鍏ョ粨鏉熷垪" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">寮�濮嬪眰: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="levBeg" placeholder="璇疯緭鍏ュ紑濮嬪眰" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁撴潫灞�: </label>
+ <div class="layui-input-block">
+ <input type="number" min="1" class="layui-input" name="levEnd" placeholder="璇疯緭鍏ョ粨鏉熷眰" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ </div>
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
--
Gitblit v1.9.1