From bdbf9db4113d375bb6cec9aab787db5adb14c480 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 03 一月 2025 16:01:38 +0800
Subject: [PATCH] #出库规则完成，盘点拣料出库测试完成
---
src/main/java/com/zy/common/model/OutLocDto.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 228 ++++++++++++++++++++++++++-------------------
src/main/webapp/views/index.html | 4
src/main/java/com/zy/asrs/entity/param/OutTaskParam.java | 23 ++++
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 4
pom.xml | 2
src/main/java/com/zy/common/service/CommonService.java | 16 ++-
src/main/webapp/views/login.html | 8
src/main/webapp/static/image/logo.png | 0
9 files changed, 175 insertions(+), 112 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6151db3..46d1a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
</dependencies>
<build>
- <finalName>wms</finalName>
+ <finalName>ddthasrs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java b/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java
new file mode 100644
index 0000000..162ab98
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java
@@ -0,0 +1,23 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OutTaskParam {
+
+ //鍒涘缓鏃堕棿
+ private Date createTime;
+ //姣忔璇锋眰鐨勫敮涓�ID锛岄槻姝㈤噸澶嶄换鍔�
+ private String uuid;
+ //浼樺厛绾�
+ private double ioPri;
+ //鍑哄簱鍙�
+ private int staNo;
+ //鎵樼洏鐮�
+ private String barcode;
+ //搴撲綅鍙�
+ private String locNo;
+
+}
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 9553b17..30b3554 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -8,10 +8,7 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
-import com.zy.asrs.entity.param.FullStoreParam;
-import com.zy.asrs.entity.param.LocDetlAdjustParam;
-import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
@@ -172,24 +169,8 @@
}
}
if (!locDetlDtos.isEmpty()) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", locMast.getLev1())
- .orderBy("bay1",false));
- for (LocMast locMast1 : locMasts) {
- if (locMast1.getLocNo().equals(locMast.getLocNo())) {
- break;
- }
- if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
- throw new CoolException(locMast.getLocNo()+"搴撲綅鍫靛锛岀姝㈠嚭搴�");
- }
- }
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
- }else {
- throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
- }
+ // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+ stockOut(staNo, locDetlDtos, null, userId);
} else {
throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
@@ -217,81 +198,133 @@
}
}
Integer ioType = null;
- // 鐢熸垚宸ヤ綔妗�
- for (OutLocDto dto : dtos) {
- // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- if (ioWorkType == null) {
- ioType = dto.isAll() ? 101 : 103;
- } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
- ioType = 107;
- }
- assert ioType != null;
- // 鑾峰彇搴撲綅
- LocMast locMast = locMastService.selectById(dto.getLocNo());
- Integer outSta = staNo.getDevNo();
-// //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
-// if(locMast.getCrnNo()==2){
-// outSta = ioType == 101 ? 204 : 202;
-// }
+ // 鎸夊垪鍜屽眰鍒嗙粍搴撲綅
+ Map<String, List<OutLocDto>> locGroups = dtos.stream()
+ .collect(Collectors.groupingBy(dto -> {
+ String column = dto.getLocNo().substring(3, 6); // 鍒楀彿
+ String level = dto.getLocNo().substring(6); // 灞傚彿
+ return column + "-" + level; // 缁勫悎鎴愬敮涓�鐨勭粍鏍囪瘑
+ }));
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(0L); // 宸ヤ綔鐘舵�侊細0.寰呮帴鏀�
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("N");
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(userId);
- wrkMast.setModiTime(now);
- if (!wrkMastService.insert(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(detlDto.getLocDetl());
- wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
- wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ // 閬嶅巻姣忕粍
+ for (Map.Entry<String, List<OutLocDto>> entry : locGroups.entrySet()) {
+ String groupKey = entry.getKey(); // 缁勬爣璇嗭紝渚嬪 "003-02" 琛ㄧず绗�3鍒楃2灞�
+ List<OutLocDto> groupDtos = entry.getValue();
+
+ // 缁勫唴浼樺厛绾ч噸鏂颁粠100寮�濮�
+ double priority = 100;
+
+ // 鎺掑簭缁勫唴搴撲綅锛堟帓鍙峰�掑簭锛�
+ groupDtos.sort(Comparator.comparing((OutLocDto dto) -> Integer.valueOf(dto.getLocNo().substring(0, 2))).reversed());
+
+ for (OutLocDto dto : groupDtos) {
+ String locNo = dto.getLocNo();
+
+ // 娣卞簱浣嶈鍒欐鏌ワ紝浠呮鏌ュ綋鍓嶅垪鍜屽眰鍐呯殑鍓嶅簱浣�
+ int currentRow = Integer.valueOf(locNo.substring(0, 2));
+ for (int i = currentRow + 1; i <= 5; i++) { // 娣卞簱浣嶄负 1-5 鎺�
+ String frontLoc = String.format("%02d%s", i, locNo.substring(2));
+ LocMast locMastFront = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", frontLoc).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMastFront)) {
+ throw new CoolException(locNo + " 鐨勫墠搴撲綅 " + frontLoc + " 鏈夎揣");
+ }
+
+ // 鍒ゆ柇鍓嶅簱浣嶆槸鍚︽湁鍏ュ簱浠诲姟
+ WrkMast wrkMastFront = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", frontLoc));
+ if (!Cools.isEmpty(wrkMastFront)) {
+ throw new CoolException(locNo + " 鐨勫墠搴撲綅 " + frontLoc + " 鏈夊叆搴撲换鍔�");
+ }
}
- }
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+dto.getLocNo());
+
+ // 璁＄畻浼樺厛绾�
+ dto.setPriority(priority);
+ priority++; // 涓嬩竴涓换鍔′紭鍏堢骇閫掑
+
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException(dto.getLocNo() + "搴撲綅涓嶅瓨鍦�");
}
- } else {
- throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ if (!locMast.getLocSts().equals("F")) {
+ throw new CoolException(dto.getLocNo() + "鎵樼洏闈炲湪搴撶姸鎬�");
+ }
+
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨�
+ if (ioWorkType == null) {
+ ioType = dto.isAll() ? 101 : 103;
+ } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
+ ioType = 107;
+ }
+ assert ioType != null;
+
+ Integer outSta = staNo.getDevNo();
+
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(0L);
+ wrkMast.setIoType(ioType);
+ wrkMast.setIoPri(priority);
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn());
+ wrkMast.setStaNo(staDesc.getStnNo());
+ wrkMast.setSourceLocNo(dto.getLocNo());
+ wrkMast.setFullPlt("Y");
+ wrkMast.setPicking("N");
+ wrkMast.setExitMk("N");
+ wrkMast.setEmptyMk("N");
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
+ }
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+ continue;
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(detlDto.getLocDetl());
+ wrkDetl.setOrderNo("");
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
+ wrkDetl.setAnfme(anfme);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+
+ // 淇敼搴撲綅鐘舵��
+ locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
}
}
}
@@ -454,13 +487,14 @@
if (!locMast.getLocSts().equals("D")){
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
}
- boolean res1 = false;
+ boolean res1 = true;
if(param.getOutSite()==100){
- res1 = true;
+ res1 = false;
}
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", locMast.getLev1())
- .orderBy("bay1",res1));
+ .eq("bay1", locMast.getBay1())
+ .eq("lev1",locMast.getLev1())
+ .orderBy("row1",res1));
for (LocMast locMast1 : locMasts) {
if (locMast1.getLocNo().equals(locMast.getLocNo())) {
break;
diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
index e79c195..3c53066 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -66,7 +66,7 @@
}else if(wrkMast.getIoType() == 10 ){//绌烘澘鍏ュ簱
workIssuedResult.setPriorityCode(12);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
- task.setStartNode("200");
+ task.setStartNode(inDevp);
task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
}else if(wrkMast.getIoType() == 101 ){//鍑哄簱
@@ -85,7 +85,7 @@
workIssuedResult.setPriorityCode(13);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
- task.setEndNode("100");
+ task.setEndNode(outDevp);
}
tasks.add(task);
workIssuedResult.setTasks(tasks);
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 77e050b..f714497 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -60,4 +60,6 @@
return sameNumber == locDetls.size();
}
+ public void setPriority(double priority) {
+ }
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5f4285a..55a2f22 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -128,7 +128,7 @@
*/
switch (rowLastnoType.getType()) {
case 4:
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 3);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 2);
}
} catch (CoolException ex) {
log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
@@ -556,9 +556,15 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
LocMast locMast1 = new LocMast();
- if(sourceStaNo == 101){
+ if(times != 0){
locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
.eq("loc_sts","O")
.eq("loc_type1", locTypeDto.getLocType1())
.orderBy("lev1,bay1 ASC"));
@@ -573,13 +579,11 @@
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
times = times - 1;
- if (times >0) {
+ if (times >= 0) {
return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
}
-
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = locMast.getLocNo();
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png
index 231c97e..e2fc662 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/index.html b/src/main/webapp/views/index.html
index d568439..5a8c6f9 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -6,7 +6,7 @@
<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">
-<!-- <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />-->
+ <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />
<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/loader.css" media="all">
@@ -26,7 +26,7 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
-<!-- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">-->
+ <img src="../static/image/logo.png" style="display: inline-block; width: 80%;height: auto">
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<!-- <img src="../static/image/logo.svg"/>-->
<!-- <cite>涓壃 - Zoneyung</cite>-->
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index b58efe4..6a28662 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -10,7 +10,7 @@
<meta name="theme-color" content="#111111">
<meta name="msapplication-TileImage" content="/sketch-threejs/img/common/ms_tileimage.png">
<meta name="msapplication-TileColor" content="#111111">
-<!-- <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />-->
+ <link rel="icon" type="image/x-icon" href="../static/image/favicon.ico" />
<link rel="stylesheet" href="../static/css/font/font-awesome-4.7.0/css/font-awesome.css">
<link rel="stylesheet" href="../static/css/main.min.css">
<link rel="stylesheet" href="../static/css/login.css">
@@ -53,7 +53,7 @@
z-index: 100;
top: 22px;
left: 20px;">
-<!-- <img src="../static/image/logo.png" alt="" style="width: 20%">-->
+ <img src="../static/image/logo.png" alt="" style="width: 20%">
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
@@ -66,8 +66,8 @@
<!-- 渚ц竟鏍� -->
<div id="sidebar">
<div class="login-contain">
- <div class="login-box">
-<!-- <img src="../static/image/logo.png" alt="" style="width: 80%">-->
+ <div class="login-box">x
+ <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" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>-->
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
--
Gitblit v1.9.1