From 1da336624f8928ecc382fc92dd9ada56fd932481 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 26 六月 2024 08:10:38 +0800
Subject: [PATCH] #
---
/dev/null | 266 -----------------------------------------------------
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 2
2 files changed, 1 insertions(+), 267 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 9a622e8..e34ee4a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -460,7 +460,7 @@
//鏌ヨ搴撳瓨
AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
- if (Cools.isEmpty(locMast)) {
+ if (!Cools.isEmpty(locMast)) {
throw new CoolException("褰撳墠璐ф灦宸插湪搴撳瓨涓紝鏃犳硶杩涜鍏ュ簱");
}
diff --git a/src/main/webapp/views/bomMat.html b/src/main/webapp/views/bomMat.html
deleted file mode 100644
index 1a91615..0000000
--- a/src/main/webapp/views/bomMat.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!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/admin.css?v=318" media="all">
- <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-</head>
-<body>
-
-<div class="layui-fluid">
- <div class="layui-card">
- <div class="layui-card-body">
- <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">
- </div>
- </div>
- <div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
- <i class="layui-icon"></i>鎼滅储
- </button>
- <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
- </div>
- </div>
- </div>
- <table class="layui-hide" id="bomMat" lay-filter="bomMat"></table>
- </div>
- </div>
-</div>
-
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
- </div>
-</script>
-
-<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
-</script>
-
-<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/bomMat/bomMat.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <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-md6">
- <div class="layui-form-item">
- <label class="layui-form-label">閮ㄤ欢鍝佸彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unitNum" placeholder="璇疯緭鍏ラ儴浠跺搧鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閮ㄤ欢鍝佸悕: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unitName" placeholder="璇疯緭鍏ラ儴浠跺搧鍚�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閮ㄤ欢瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unitSpace" placeholder="璇疯緭鍏ラ儴浠惰鏍�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">缁勪欢鍝佸彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bomNum" placeholder="璇疯緭鍏ョ粍浠跺搧鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">缁勪欢鍝佸悕: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bomName" placeholder="璇疯緭鍏ョ粍浠跺搧鍚�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">缁勪欢瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bomSpace" placeholder="璇疯緭鍏ョ粍浠惰鏍�">
- </div>
- </div>
-
- </div>
- <div class="layui-col-md6">
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍏冧欢鍝佸彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="elementNum" placeholder="璇疯緭鍏ュ厓浠跺搧鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍏冧欢鍝佸悕: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="elementName" placeholder="璇疯緭鍏ュ厓浠跺搧鍚�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍏冧欢瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="elementSpace" placeholder="璇疯緭鍏ュ厓浠惰鏍�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">缁勬垚鐢ㄩ噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bomAnfme" placeholder="璇疯緭鍏ョ粍鎴愮敤閲�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵樼洏鏁伴噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="zpalletAnfme" placeholder="璇疯緭鍏ユ墭鐩樻暟閲�">
- </div>
- </div>
-
- </div>
-
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
-</html>
-
diff --git a/src/main/webapp/views/bomMat.js b/src/main/webapp/views/bomMat.js
deleted file mode 100644
index f4723ec..0000000
--- a/src/main/webapp/views/bomMat.js
+++ /dev/null
@@ -1,266 +0,0 @@
-var pageCurr;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var admin = layui.admin;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#bomMat',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/bomMat/list/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID',hide: true}
- ,{field: 'unitNum', align: 'center',title: '閮ㄤ欢鍝佸彿'}
- ,{field: 'unitName', align: 'center',title: '閮ㄤ欢鍝佸悕'}
- ,{field: 'unitSpace', align: 'center',title: '閮ㄤ欢瑙勬牸'}
- ,{field: 'bomNum', align: 'center',title: '缁勪欢鍝佸彿'}
- ,{field: 'bomName', align: 'center',title: '缁勪欢鍝佸悕'}
- ,{field: 'bomSpace', align: 'center',title: '缁勪欢瑙勬牸'}
- ,{field: 'elementNum', align: 'center',title: '鍏冧欢鍝佸彿'}
- ,{field: 'elementName', align: 'center',title: '鍏冧欢鍝佸悕'}
- ,{field: 'elementSpace', align: 'center',title: '鍏冧欢瑙勬牸'}
- ,{field: 'bomAnfme', align: 'center',title: '缁勬垚鐢ㄩ噺'}
- ,{field: 'zpalletAnfme', align: 'center',title: '鎵樼洏鏁伴噺'}
- ,{field: 'modiUser', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
- ,{field: 'appeUser', align: 'center',title: '娣诲姞浜哄憳',hide: true}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: true}
- ,{field: 'isDeleted', align: 'center',title: '鏄惁鍒犻櫎',hide: true}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
- ]],
- 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;
- limit();
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(bomMat)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {curr: 1}
- });
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(bomMat)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- 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=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'bomMat': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/bomMat/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(bomMat)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '1200px',
- title: (mData ? '淇敼' : '娣诲姞') + '缁勪欢',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/bomMat/"+(mData?'update':'add')+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
-
- /* 鍒犻櫎 */
- function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
- skin: 'layui-layer-admin',
- shade: .1
- }, function (i) {
- layer.close(i);
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/bomMat/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {ids: ids},
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- }
-
- // 鎼滅储
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime',
- value: data!==undefined?data['modiTime\\$']:null
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime',
- value: data!==undefined?data['appeTime\\$']:null
- });
-
- }, 300);
- }
- layDateRender();
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(child) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
-}
--
Gitblit v1.9.1