From 006ca71bd84497f2ff53630a3f9257f7a6e29391 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 06 一月 2022 08:49:10 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 25 +++++++++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 76 --------------------------------------
src/main/webapp/static/css/crn.css | 6 +-
3 files changed, 26 insertions(+), 81 deletions(-)
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 2bf12e2..aa13b7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1191,82 +1191,6 @@
/**
* 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
*/
- @Async
- public void crnDemoOfLocMove(Integer crn){
- for (int i = 0; i < 5; i++) {
-
- LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn);
- LocMast loc = locMastService.queryDemoLoc(crn);
- if (null == sourceLoc || null == loc) {
- break;
- }
- String sourceLocNo = sourceLoc.getLocNo();
- String locNo = loc.getLocNo();
-
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(13D);
- wrkMast.setCrnNo(crn);
- wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
- wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt("N"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
- wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setAppeTime(new Date());
- wrkMast.setModiTime(new Date());
- int res = wrkMastMapper.insert(wrkMast);
- if (res == 0) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
- for (LocDetl locDetl : locDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(locDetl.getAnfme());
- VersionUtils.setWrkDetl(wrkDetl, locDetl); // 鐗堟湰鎺у埗
- wrkDetl.setAppeTime(new Date());
- wrkDetl.setModiTime(new Date());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
- sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- sourceLoc.setModiTime(new Date());
- if (!locMastService.updateById(sourceLoc)){
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException("婧愬簱浣嶅嚭搴撳け璐�");
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(new Date());
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触");
- }
- }
- }
-
- /**
- * 鍫嗗灈鏈烘紨绀� ===>> 搴撲綅绉昏浆
- */
public synchronized void crnDemoOfLocMove1(){
for (CrnSlave crn : slaveProperties.getCrn()) {
if (!crn.getDemo()) { continue; } // 蹇呴』涓烘紨绀虹姸鎬�
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
index ea974b0..43289ac 100644
--- a/src/main/webapp/static/css/crn.css
+++ b/src/main/webapp/static/css/crn.css
@@ -22,7 +22,7 @@
padding: 10px;
}
.crn-command-item {
- padding: 20px 0;
+ padding: 4px 0;
}
.crn-command-item label {
font-size: 20px;
@@ -77,7 +77,7 @@
.crn-msg {
overflow: auto;
margin-top: 10px;
- height: 20%;
+ height: 23%;
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
@@ -226,7 +226,7 @@
/* -------------------- 绗洓妯″潡 -------------------- */
.crn-output-board {
margin-top: 10px;
- height: 23%;
+ height: 20%;
background-color: #fff;
border-radius: 5px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 0a247fa..957777c 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -47,7 +47,7 @@
<!-- 鎵ц鍛戒护 -->
<div class="command-log">
- <h2>鎵ц涓殑鍛戒护</h2>
+ <h3>鎵ц涓殑鍛戒护</h3>
<div class="crn-command-item">
<label>1#</label>
<button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
@@ -59,6 +59,24 @@
<button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
<!-- <span> </span>-->
<input id="crn2" disabled="disabled">
+ </div>
+ <div class="crn-command-item">
+ <label>3#</label>
+ <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn3" disabled="disabled">
+ </div>
+ <div class="crn-command-item">
+ <label>4#</label>
+ <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn4" disabled="disabled">
+ </div>
+ <div class="crn-command-item">
+ <label>5#</label>
+ <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+ <!-- <span> </span>-->
+ <input id="crn5" disabled="disabled">
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -129,6 +147,9 @@
<div class="select-container">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
<label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -618,4 +639,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1