From f17ef6c78d8a0699c7be5715c554878d8c51e884 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期五, 17 五月 2024 10:27:07 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 19 +++++++++
src/main/java/com/zy/asrs/controller/LocMastController.java | 34 +++++++++++++----
src/main/java/com/zy/asrs/entity/param/LocMastInitParam.java | 8 ++++
src/main/java/com/zy/common/model/Shelves.java | 2
4 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 51b0eab..8bfe17e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -15,10 +15,12 @@
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -66,15 +68,24 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
+ } else if (entry.getKey().equals("loc_no")){
wrapper.like(entry.getKey(), val);
+ } else {
+ if (entry.getKey().equals("loc_type1")){
+ sign=true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
+ }
+ if (sign){
+ wrapper.and().ne("loc_sts","Y");
}
}
@@ -89,8 +100,8 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
@@ -173,10 +184,16 @@
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
for (List<Integer> node : shelves.nodes){
+
if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
break;
}
}
@@ -199,9 +216,10 @@
}
}
}
-// locMastService.delete(new EntityWrapper<>());
-// locDetlService.delete(new EntityWrapper<>());
-// locMastService.insertBatch(list);
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
+ locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
}
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..ace149b 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,12 @@
// 杞婚噸绫诲瀷锛� 1锛氳交搴撲綅 2锛氶噸搴撲綅
private Short locType3;
+ private Integer enable;
+
+ private Integer staCrn;
+
+ private Integer endCrn;
+
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 b759351..69ee387 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -38,7 +38,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/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 6f4b17d..6c79eb6 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -95,6 +95,15 @@
<!-- 閲嶇疆搴撲綅寮圭獥 -->
<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-form-item">
<div class="layui-inline">
@@ -134,12 +143,22 @@
</div>
</div>
</div>
+ <!-- 鍫嗗灈鏈烘暟閲� -->
<div class="layui-form-item">
<label class="layui-form-label">鍫嗗灈鏈烘暟閲�</label>
<div class="layui-input-inline">
<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>
--
Gitblit v1.9.1