From 88f285842419bdc871ba1a5da897e0ac90ee08fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:09:37 +0800
Subject: [PATCH] #
---
/dev/null | 134 ---------------------------------
src/main/webapp/views/pakStore/pakStore.html | 1
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 18 +--
src/main/java/com/zy/asrs/service/BasDevpService.java | 5
src/main/webapp/static/js/order/order.js | 7 -
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 4
src/main/java/com/zy/common/model/LocTypeDto.java | 4 +
src/main/java/com/zy/common/service/CommonService.java | 20 -----
src/main/webapp/static/js/pakStore/pakStore.js | 37 +++++++--
src/main/webapp/views/pakStore/matQuery.html | 9 +
10 files changed, 51 insertions(+), 188 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 8628feb..00b3589 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -39,9 +39,8 @@
/**
* 鐩爣绔欑偣鐘舵�佹娴�
- * @param devpNo
- * @param put 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
+ * @param pakin 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
*/
- BasDevp checkSiteStatus(Integer devpNo, boolean put);
+ BasDevp checkSiteStatus(Integer devpNo, boolean pakin);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index c677e5c..babb339 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -43,12 +43,12 @@
}
@Override
- public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
+ public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
BasDevp station = selectById(devpNo);
if (station == null){
throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
- if (put) {
+ if (pakin) {
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
}
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 60b07d3..e8ea487 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,6 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -76,12 +75,11 @@
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
throw new CoolException(BaseRes.PARAM);
}
+ Date now = new Date();
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- log.info(JSON.toJSONString(locTypeDto));
- log.info("{}鍏ュ簱鍙ｅ昂瀵告娴嬶細{}", param.getDevpNo(), locTypeDto.getLocType1()==1?"浣庤鏍煎簱浣�":"楂樿鏍煎簱浣�");
List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
@@ -92,7 +90,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾э細10
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -104,13 +102,11 @@
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeUser(userId);
- wrkMast.setAppeTime(new Date());
+ wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
- wrkMast.setModiTime(new Date());
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -122,7 +118,7 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiUser(userId);
- sourceStaNo.setModiTime(new Date());
+ sourceStaNo.setModiTime(now);
if (!basDevpService.updateById(sourceStaNo)){
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
@@ -131,7 +127,7 @@
if (locMast.getLocSts().equals("O")){
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiUser(userId);
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index b6343ba..60a9a28 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,12 +1,15 @@
package com.zy.common.model;
+import com.alibaba.fastjson.JSON;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
/**
* Created by vincent on 2020/10/19
*/
+@Slf4j
@Data
public class LocTypeDto {
@@ -28,6 +31,7 @@
} else {
this.locType1 = 2; // 楂樺簱浣�
}
+ log.info(JSON.toJSONString(this));
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 29bb377..04bc957 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -99,26 +99,6 @@
StartupDto startupDto = new StartupDto();
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
-
- switch (sourceStaNo) {
- case 202:
- whsType = 2;
- break;
- case 205:
- whsType = 1;
- break;
- case 126:
- whsType = 3;
- break;
- case 110:
- whsType = 4;
- break;
- case 301:
- whsType = 5;
- break;
- default:
- throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo);
- }
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index bbac8d8..69302a4 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -137,8 +137,6 @@
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
- var mlist=null
- var inQtys=[]
admin.open({
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
@@ -215,11 +213,6 @@
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
done: function (res) {
- mlist= res.data
- for (let i = 0; i < mlist.length; i++) {
- var waitIn=mlist[i]
- inQtys.push(waitIn.qty)
- }
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index e7af385..344d0e8 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,21 +1,25 @@
-
+var admin;
var initCountVal = 0;
var matCodeData = [];
function getCol() {
var cols = [
- {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ {fixed: 'left', field: 'count', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: blue;font-weight: bold'}
];
cols.push.apply(cols, matCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['admin', 'table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -35,6 +39,23 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
+ let index = obj.tr.attr("data-index");
+ let data = matCodeData[index];
+ if (obj.field === 'anfme'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ return false;
+ } else {
+ if (vle <= 0) {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ return false;
+ }
+ }
+ }
+ data[obj.field] = obj.value;
+ tableIns.reload({data: matCodeData});
+
updateMatCodeData(obj.data.matNo, Number(obj.value));
});
@@ -93,7 +114,7 @@
var data = obj.data;
switch (obj.event) {
case 'remove':
- for (var i = matCodeData.length - 1; i >= 0; i--) {
+ for (let i = matCodeData.length - 1; i >= 0; i--) {
if (matCodeData[i].matNo === data.matNo) {
matCodeData.splice(i, 1);
}
@@ -101,7 +122,6 @@
tableIns.reload({data: matCodeData,done:function (res) {
limit();
getInBound();
- // 瑕嗙洊render鏂规硶鐨刣one
}});
break;
}
@@ -132,7 +152,6 @@
tableIns.reload({data: matCodeData,done:function (res) {
limit();
getInBound();
- // 瑕嗙洊render鏂规硶鐨刣one
}});
}
@@ -152,7 +171,7 @@
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
})
@@ -164,7 +183,7 @@
// 鎻愬彇鐗╂枡
var matCodeLayerIdx;
function getMat() {
- matCodeLayerIdx = layer.open({
+ matCodeLayerIdx = admin.open({
type: 2,
title: '鎻愬彇鐗╂枡',
maxmin: true,
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 530de5b..ebe944e 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -7,6 +7,7 @@
<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">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
@@ -68,7 +69,7 @@
</body>
<script>
function getCol() {
- var cols = [
+ let cols = [
{type: 'checkbox', fixed: 'left'}
];
cols.push.apply(cols, matCols);
@@ -79,12 +80,16 @@
return cols;
}
var pageCurr;
- layui.use(['table','laydate', 'form'], function() {
+ 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;
+
// 鐗╂枡鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
elem: '#matCode',
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 2387f41..0319043 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -7,6 +7,7 @@
<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">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
diff --git a/src/main/webapp/views/pakStore/pakStore0.html b/src/main/webapp/views/pakStore/pakStore0.html
deleted file mode 100644
index 3d66c64..0000000
--- a/src/main/webapp/views/pakStore/pakStore0.html
+++ /dev/null
@@ -1,134 +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/cool.css" media="all">
- <link rel="stylesheet" href="../../static/css/common.css" media="all">
- <style>
- html {
- height: 100%;
- padding: 10px;
- background-color: #f1f1f1;
- }
- body {
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- }
-
- .function-area {
- padding: 20px 50px;
- }
- .function-btn {
- font-size: 16px;
- padding: 1px 1px 1px 1px;
- width: 100px;
- height: 50px;
- border-color: #2b425b;
- border-radius: 4px;
- border-width: 2px;
- background: none;
- border-style: solid;
- transition: 0.4s;
- cursor: pointer;
- letter-spacing: 3px;
- }
- .function-btn:hover {
- background-color: #2b425b;
- color: #fff;
- }
-
- .layui-layer-page .layui-layer-content {
- position: relative;
- overflow: visible !important;
- }
-
- #staNoSpan {
- text-align: center;
- display: inline-block;
- width: 100px;
- font-size: 13px;
- }
- .layui-btn-container .layui-form-select {
- display: inline-block;
- width: 150px;
- height: 30px;
- }
- .layui-btn-container .layui-form-select.layui-form-selected {
- display: inline-block;
- width: 150px;
- }
- .layui-btn-container .layui-select-title input {
- font-size: 13px;
- }
- .layui-btn-container .layui-anim.layui-anim-upbit dd {
- font-size: 13px;
- }
-
- #btn-comb {
- margin-left: 60px;
- }
- </style>
-</head>
-<body>
-<!-- 鍔熻兘鍖� -->
-<div class="function-area">
- <div class="layui-inline" style="margin-top: 30px">
- <div class="layui-input-inline">
- <input id="focusMatByMat" class="layui-input" onkeyup="focusMat(this)" type="text" placeholder="杈撳叆/鎵爜" autocomplete="off">
- </div>
- </div>
-<!-- <button id="mat-query" class="function-btn" onclick="getMat()">鏂板</button>-->
-</div>
-
-<hr>
-
-<!-- 琛ㄦ牸 -->
-<div style="padding-bottom: 5px; margin-bottom: 45px">
-
- <!-- 澶撮儴 -->
- <script type="text/html" id="toolbar">
- <div class="layui-form">
- <div class="layui-btn-container">
- <!-- 1.閫夋嫨鍏ュ簱鍙� -->
- <span id="staNoSpan">鍏ュ簱鍙ｏ細</span>
- <select id="putSiteSelect" lay-verify="required">
- <option value="301">301</option>
- </select>
- <!-- 2.鍚姩鍑哄簱 -->
- <button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">鍚姩鍏ュ簱</button>
- </div>
- </div>
- </script>
-
- <!-- 琛� -->
- <script type="text/html" id="operate">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
- </script>
-
- <table class="layui-table" id="chooseData" lay-filter="chooseData"></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>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
-
-<script type="text/template" id="putSiteSelectTemplate">
- {{#each data}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
-</script>
-<script>
- window.onload = function(){document.getElementById("focusMatByMat").focus();}
-</script>
-</body>
-</html>
-
--
Gitblit v1.9.1