From a5cfba54344075f8a2a9fc30b457393b8a42bb35 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 29 四月 2025 09:25:44 +0800
Subject: [PATCH] *
---
src/main/webapp/views/locMast/locMast.html | 59 +++++++++++++++++--
src/main/webapp/static/wms/js/locMast/locMast.js | 2
src/main/java/com/zy/asrs/controller/LocMastController.java | 62 ++++++++++++++++++++
src/main/java/com/zy/core/thread/LedThread.java | 2
src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | 10 +++
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 20 +++---
src/main/java/com/zy/common/model/Shelves.java | 2
7 files changed, 138 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index b56e0dd..31fdefa 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -197,6 +197,68 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/init/auth2")
+ @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+// @Transactional
+ public R init2(LocMastInitParam param) {
+ try{
+ List<LocMast> list = new ArrayList<>();
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ // 鑾峰彇鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
+
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
+ break;
+ }
+ }
+ }catch (Exception e){
+ throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
+ }
+
+ Date now = new Date();
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocSts("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+// locMast.setGro1(r); // 缁�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
+ locMast.setAppeUser(getUserId());
+ locMast.setAppeTime(now);
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(now);
+// locMast.setWhsType(basWhs.getId());
+ list.add(locMast);
+ }
+ }
+ }
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }catch (Exception e){
+ return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
+ }
+ }
+
@RequestMapping(value = "/locMast/init/auth")
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
diff --git a/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
index 4f8fb39..3727293 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java
@@ -2,10 +2,12 @@
import com.core.common.BaseRes;
import com.core.exception.CoolException;
+import lombok.Data;
/**
* Created by vincent on 2020/6/13
*/
+@Data
public class LocMastInitParam {
// 璧峰鎺�
@@ -38,6 +40,14 @@
// 杞婚噸绫诲瀷锛� 1锛氳交搴撲綅 2锛氶噸搴撲綅
private Short locType3;
+ private Integer enable;
+
+ private Integer staCrn;
+
+ private Integer endCrn;
+
+ private String identifying;
+
public Integer getStartRow() {
if (null == startRow) {
throw new CoolException(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/common/model/Shelves.java b/src/main/java/com/zy/common/model/Shelves.java
index de2aa46..0d13add 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -37,7 +37,7 @@
public Shelves(int size, int group, int offset) {
this.size = size;
this.group = group;
- this.offset = offset;
+ this.offset = offset-1;
init();
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 056c0e8..c4cf476 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -112,7 +112,7 @@
if(idx >= 0){
strQty.substring(0,idx);
}
- page.newLine(matDto.getMaknx() + "[鏁伴噺" + strQty +"]");
+ page.newLine(matDto.getMaktx() + "[鏁伴噺" + strQty +"]");
// page.newLine(matDto.getMaknx() + "銆愭暟閲�" + matDto.getCount() +"銆�");
}
}
diff --git a/src/main/webapp/static/wms/js/locMast/locMast.js b/src/main/webapp/static/wms/js/locMast/locMast.js
index f7cc2e2..3dc1f53 100644
--- a/src/main/webapp/static/wms/js/locMast/locMast.js
+++ b/src/main/webapp/static/wms/js/locMast/locMast.js
@@ -393,7 +393,7 @@
// 鍒濆鍖栦繚瀛�
form.on('submit(initDo)', function (data) {
$.ajax({
- url: baseUrl+"/locMast/init/auth",
+ url: baseUrl+"/locMast/init/auth2",
headers: {'token': localStorage.getItem('token')},
data: data.field,
method: 'POST',
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 56f0abc..483fb0b 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -104,6 +104,45 @@
<!-- 閲嶇疆搴撲綅寮圭獥 -->
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒犻櫎搴撲綅</label>
+ <div class="layui-input-inline" style="width: 100px;">
+ <input type="checkbox" name="enable" lay-skin="switch" value="1" lay-text="鍒犻櫎|淇濈暀">
+ </div>
+ </div>
+ </div>
+ <!-- <div class="layui-inline" style="width:80%">-->
+ <!-- <label class="layui-form-label"><span class="not-null">*</span>搴撲綅绫诲瀷锛�</label>-->
+ <!-- <div class="layui-input-inline cool-auto-complete">-->
+ <!-- <input id="identifying" class="layui-input" type="text" style="display: none">-->
+ <!-- <input id="identifying$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>-->
+ <!-- <div class="cool-auto-complete-window">-->
+ <!-- <input class="cool-auto-complete-window-input" data-key="basWhsQueryBywhsType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+ <!-- <select class="cool-auto-complete-window-select" data-key="basWhsQueryBywhsTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!--
+ /**
+ * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
+ */
+ -->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="identifying">-->
+<!-- <!– <option style="display: none"></option>–>-->
+<!-- <!– <option value="0">鏈煡</option>–>-->
+<!-- <option value="1" style="display: none">鏍囧噯鍫嗗灈鏈哄簱</option>-->
+<!-- <option value="2">骞冲簱</option>-->
+<!-- <option value="3">绌挎鏉�</option>-->
+<!-- <option value="4">鍥涘悜杞�</option>-->
+<!-- <option value="5">AGV</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鎺� -->
<div class="layui-form-item">
<div class="layui-inline">
@@ -149,15 +188,23 @@
<input type="text" name="crnAmount" lay-verify="required|number" autocomplete="off" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">璧峰鍫嗗灈鏈�</label>
+ <div class="layui-input-inline" >
+ <input type="text" name="staCrn" autocomplete="off" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+ </div>
<!-- 搴撲綅绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">妗剁被鍨�</label>
+ <label class="layui-form-label">楂樹綆绫诲瀷</label>
<div class="layui-input-inline">
<select name="locType1">
<option style="display: none"></option>
<option value="0">鏈煡</option>
- <option value="1">娌规《</option>
- <option value="2">鍑�妗�</option>
+ <option value="1">浣庡簱浣�</option>
+ <option value="2">楂樺簱浣�</option>
</select>
</div>
</div>
@@ -183,9 +230,9 @@
</select>
</div>
</div>
- <div id="prompt" style="text-indent: 10px;">
- <span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>
- </div>
+ <!-- <div id="prompt" style="text-indent: 10px;">-->
+ <!-- <span class="not-null">鍒濆鍖栧簱浣嶅悗灏嗗垹闄ゅ簱瀛樻槑缁嗭紝璇疯皑鎱庢搷浣滐紒</span>-->
+ <!-- </div>-->
<!-- 鎸夐挳 -->
<div style="text-align: center; margin-top: 20px">
<button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">纭畾</button>
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a1a20e5..64470b7 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -41,16 +41,16 @@
</el-form-item>
</el-form>
<el-table ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100">
- <template slot-scope="scope">
- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </template>
- </el-table-column>
+<!-- <el-table-column label="鎿嶄綔" width="100">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">-->
+<!-- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>-->
+<!-- <el-dropdown-menu slot="dropdown">-->
+<!-- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </el-dropdown>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column property="taskNo" label="浠诲姟鍙�">
</el-table-column>
<el-table-column property="status$" label="浠诲姟鐘舵��">
--
Gitblit v1.9.1