From b2629d65e6af766b4d285068e954ca65aed513e5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 14 一月 2026 10:17:55 +0800
Subject: [PATCH] logo不显示中扬信息
---
/dev/null | 0
src/main/webapp/static/image/logo_light_colour1.png | 0
src/main/webapp/static/image/logo1.png | 0
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 25 ++++++++++++++-----------
src/main/webapp/static/image/favicon1.ico | 0
src/main/webapp/views/index.html | 24 ++++++++++++------------
src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
src/main/webapp/static/image/zy_logo_dark_color1.png | 0
src/main/webapp/views/login.html | 2 +-
9 files changed, 28 insertions(+), 25 deletions(-)
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 8ecbbfc..c63fb27 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -539,16 +539,16 @@
wrkDetl.setStandby1(locDto.getStandby1());
wrkDetl.setBatch(locDto.getBatch());
wrkDetl.setOrderNo(locDto.getOrderNo());
-// wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
- LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
- .eq("loc_no", locDto.getLocNo())
- .eq("batch", locDto.getBatch())
- .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
- .eq("matnr", locDto.getMatnr()));
- if (Objects.isNull(locDel)) {
- throw new CoolException("鏁版嵁閿欒锛屽簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
- }
- wrkDetl.setAnfme(locDel.getAnfme());
+ wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
+// LocDetl locDel = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+// .eq("loc_no", locDto.getLocNo())
+// .eq("batch", locDto.getBatch())
+// .eq(!Objects.isNull(locDto.getBarcode()), "barcode", locDto.getBarcode())
+// .eq("matnr", locDto.getMatnr()));
+// if (Objects.isNull(locDel)) {
+// throw new CoolException("鏁版嵁閿欒锛屽簱瀛樻槑缁嗕笉瀛樺湪锛侊紒");
+// }
+// wrkDetl.setAnfme(locDel.getAnfme());
wrkDetl.setAppeTime(now);
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
@@ -1392,6 +1392,10 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
+ if (wrkMast.getWrkSts() != 15) {
+ throw new CoolException("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
+ }
+
Integer ioType = wrkMast.getIoType() - 50;
Integer wokNo;
// 鍏ュ嚭搴撶被鍨嬪垽鏂�
@@ -1453,7 +1457,6 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
-
wrkMast.setWrkCode(null);
if (!wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/webapp/static/image/favicon.ico b/src/main/webapp/static/image/favicon1.ico
similarity index 100%
rename from src/main/webapp/static/image/favicon.ico
rename to src/main/webapp/static/image/favicon1.ico
Binary files differ
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo1.png
similarity index 100%
rename from src/main/webapp/static/image/logo.png
rename to src/main/webapp/static/image/logo1.png
Binary files differ
diff --git a/src/main/webapp/static/image/logo_light_colour.png b/src/main/webapp/static/image/logo_light_colour.png
deleted file mode 100644
index 815d824..0000000
--- a/src/main/webapp/static/image/logo_light_colour.png
+++ /dev/null
Binary files differ
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo_light_colour1.png
similarity index 100%
copy from src/main/webapp/static/image/logo.png
copy to src/main/webapp/static/image/logo_light_colour1.png
Binary files differ
diff --git a/src/main/webapp/static/image/zy_logo_dark_color.png b/src/main/webapp/static/image/zy_logo_dark_color1.png
similarity index 100%
rename from src/main/webapp/static/image/zy_logo_dark_color.png
rename to src/main/webapp/static/image/zy_logo_dark_color1.png
Binary files differ
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 89dce56..b6e9e64 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -304,7 +304,7 @@
// 鎷ｆ枡鍏ュ簱
case 'pick':
layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
- http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:3}, function (res) {
+ http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:4}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
})
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index bf617ad..ede1192 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>涓壃 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+<!-- <title>涓壃 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -25,12 +25,12 @@
<div class="layui-layout layui-layout-admin">
<!-- 澶撮儴 -->
<div class="layui-header">
- <div class="layui-logo">
- <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">
- <!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
- <!-- <img src="../static/image/logo.svg"/>-->
- <!-- <cite>涓壃 - Zoneyung</cite>-->
- </div>
+<!-- <div class="layui-logo">-->
+<!-- <img src="../static/image/zy_logo_dark_color.png" style="display: inline-block; width: 40%;height: auto">-->
+<!-- <!– <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>–>-->
+<!-- <!– <img src="../static/image/logo.svg"/>–>-->
+<!-- <!– <cite>涓壃 - Zoneyung</cite>–>-->
+<!-- </div>-->
<ul class="layui-nav layui-layout-left">
<li class="layui-nav-item" lay-unselect>
@@ -74,10 +74,10 @@
<!-- 涓讳綋閮ㄥ垎 -->
<div class="layui-body"></div>
<!-- 搴曢儴 -->
- <div class="layui-footer layui-text">
- copyright 漏 2022 <a href="https://www.superton.cn/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.
- <span class="pull-right">Version 1.0.0</span>
- </div>
+<!-- <div class="layui-footer layui-text">-->
+<!-- copyright 漏 2022 <a href="https://www.superton.cn/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.-->
+<!-- <span class="pull-right">Version 1.0.0</span>-->
+<!-- </div>-->
</div>
@@ -91,7 +91,7 @@
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
- console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
+ // console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
$(function () {
if ("" === localStorage.getItem('token')) {
top.location.href = baseUrl + "/login";
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 23f1ef0..a113203 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>涓壃 鈹� login of zoneyung wms</title>
+ <title>WMS</title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
<meta name="description" content="study of Instancing with three.js">
<meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">
--
Gitblit v1.9.1