From 142a104afe9938851996e00bcfa96989c44f2c4a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:07:12 +0800
Subject: [PATCH] #修改站点数据--todo（未完成）
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 +-
src/main/webapp/views/pipeline.html | 32 +++++++++++++++++++++++++++++++-
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 62d8928..d005b1b 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -53,7 +53,7 @@
int saveWrkDetlLog(Integer workNo);
// update 鍏ュ簱閫氱煡妗�
- @Update("update cust_wait_pakin set status='Y' where zpallet = #{barcode}")
+ @Update("update cust_wait_pakin set io_status='Y' where zpallet = #{barcode}")
int updateWaitPakInStep1(String barcode);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 5f51f3e..b5a9ef3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -90,7 +90,7 @@
continue;
}
// 鑾峰彇鍏ュ簱閫氱煡妗�
- List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode));
+ List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
if (waitPakins.isEmpty()) {
log.warn("鏃犳鍏ュ簱鏉＄爜鏁版嵁銆傛潯鐮佸彿={}", barcode);
continue;
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c4271de..31c41bf 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -9,6 +9,7 @@
<link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
<link rel="stylesheet" type="text/css" href="../static/css/common.css">
<link rel="stylesheet" type="text/css" href="../static/css/pipeline.css">
+ <link rel="stylesheet" type="text/css" href="../static/layui/css/layui.css" media="all">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
@@ -77,7 +78,30 @@
</footer>
<div id="site-detl" style="display: none">
- hello world
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绔欑偣:</label>
+ <div class="layui-input-block">
+ <input id="siteId" name="siteId" placeholder="璇疯緭鍏ョ珯鐐圭紪鍙�" class="layui-input" lay-verify="required|number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">宸ヤ綔鍙�:</label>
+ <div class="layui-input-block">
+ <input id="workNo" name="workNo" type="number" placeholder="璇疯緭鍏ュ伐浣滃彿" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐩爣绔�:</label>
+ <div class="layui-input-block">
+ <input id="staNo" name="staNo" type="number" placeholder="璇疯緭鍏ョ洰鏍囩珯" class="layui-input" lay-verify="number" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-form-item cool-button-contain">
+ <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">鎵撳嵃</button>
+ <button class="layui-btn layui-btn-primary" id="cancel">鍙栨秷</button>
+ </div>
+ </div>
</div>
</body>
<script>
@@ -108,6 +132,12 @@
layer.open({
type: 1,
title: false,
+ shadeClose: true,
+ offset: 'rt',
+ anim: 5,
+ shade: [0],
+ area: ['340px', '215px'],
+ closeBtn: 0,
content: $("#site-detl"),
success: function(layero, index){
--
Gitblit v1.9.1