From 9d67925f88f60e83a0a46962cf643f9aebc47575 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:14 +0800
Subject: [PATCH] #
---
src/main/webapp/static/image/logo.jpg | 0
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++----
src/main/java/com/zy/common/web/WcsController.java | 5 +++--
src/main/webapp/views/login.html | 2 +-
src/main/webapp/static/image/logo.png | 0
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5c5fe37..1a632e0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -190,7 +190,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
+ List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
int rowCount = rowLastnoService.selectCount(null);
Integer integer = 2;
for (int i = 1; i <= rowCount; i++) {
@@ -202,7 +203,7 @@
}
}
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null,0, locTypeDto,0);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null,0, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c710f9a..fa37930 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -434,7 +434,7 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -454,7 +454,7 @@
</choose>
order by
- a.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
@@ -645,7 +645,7 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -665,7 +665,7 @@
</choose>
order by
- a.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
diff --git a/src/main/webapp/static/image/logo.jpg b/src/main/webapp/static/image/logo.jpg
new file mode 100644
index 0000000..a872192
--- /dev/null
+++ b/src/main/webapp/static/image/logo.jpg
Binary files differ
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png
index 11b4dad..cce277d 100644
--- a/src/main/webapp/static/image/logo.png
+++ b/src/main/webapp/static/image/logo.png
Binary files differ
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index a36dd6e..a559d86 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -68,7 +68,7 @@
<div class="login-contain">
<div class="login-box">
<img src="../static/image/logo.png" alt="" style="width: 80%">
- <span class="login100-form-title p-t-20 p-b-45">绫冲鏅鸿兘</span>
+<!-- <span class="login100-form-title p-t-20 p-b-45">绫冲鏅鸿兘</span>-->
<span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
<input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
--
Gitblit v1.9.1