From b4b2da143af53a7422135abffd5306b282be6a39 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 16 四月 2025 09:46:11 +0800
Subject: [PATCH] 2.0版本
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 196 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 168 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a2a3819..91e3add 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -53,22 +53,25 @@
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("loc_attribute",false);
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -89,13 +92,23 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
- public R update(LocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
+ public R update(LocMast locMast) {
+ if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+ if (locX(locMast.getLocNo())) {
+ if (oldLocMast.getLocSts().equals("X")) {
+ return R.error("姝ゅ娌℃湁搴撲綅锛岃鏍规嵁鐜板満鎯呭喌鎿嶄綔锛侊紒锛�");
+ } else {
+ locMast.setLocSts("X");
+ }
+ }
+ if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ }
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
@@ -108,14 +121,56 @@
return R.ok();
}
+ public boolean locX(String locNo) {
+ switch (locNo) {
+ case "1300601":
+ case "1300602":
+ case "1300603":
+ case "1300604":
+ case "1300605":
+ case "1300606":
+ case "1300701":
+ case "1300702":
+ case "1300703":
+ case "1300704":
+ case "1300705":
+ case "1300706":
+ case "1301301":
+ case "1301302":
+ case "1301303":
+ case "1301304":
+ case "1301305":
+ case "1301306":
+ case "1301401":
+ case "1301402":
+ case "1301403":
+ case "1301404":
+ case "1301405":
+ case "1301406":
+ case "1302001":
+ case "1302002":
+ case "1302003":
+ case "1302004":
+ case "1302005":
+ case "1302006":
+ case "1301205":
+ case "1301206":
+ case "1302402":
+ case "1402402":
+ return true;
+ default:
+ return false;
+ }
+ }
+
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocMast entity : list){
+ for (LocMast entity : list) {
locMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -123,7 +178,7 @@
@RequestMapping(value = "/locMast/export/auth")
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -139,7 +194,7 @@
wrapper.like("loc_no", condition);
Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocMast locMast : page.getRecords()){
+ for (LocMast locMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locMast.getLocNo());
map.put("value", locMast.getLocNo());
@@ -152,10 +207,22 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locMastService.selectOne(wrapper)){
+ if (null != locMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
+ }
+
+ @GetMapping(value = "/locMast/check/column/group1")
+ public void group1() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",9));
+ for (LocMast locMast : locMasts) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1",8).eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
+ locMast1.setGroup1(locMast.getGroup1());
+ locMastService.updateById(locMast1);
+ }
+
+
}
@RequestMapping(value = "/locMast/init/auth")
@@ -163,20 +230,21 @@
// @Transactional
public R init(LocMastInitParam param) {
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++) {
+ 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;
Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
- for (List<Integer> node : shelves.nodes){
+ for (List<Integer> node : shelves.nodes) {
if (node.contains(r)) {
crnNo = shelves.nodes.indexOf(node) + 1;
break;
}
}
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
locMast.setLocSts("O");
@@ -184,20 +252,92 @@
locMast.setBay1(b); // 鍒�
locMast.setLev1(l); // 灞�
locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(param.getLocType1());
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
locMast.setLocType2(param.getLocType2());
locMast.setLocType3(param.getLocType3());
locMast.setAppeUser(getUserId());
- locMast.setAppeTime(new Date());
+ locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
list.add(locMast);
}
}
}
- locMastService.delete(new EntityWrapper<>());
+// locMastService.delete(new EntityWrapper<>());
locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
-}
+
+ /**
+ * 鍒濆鍖栫粍
+ */
+// @GetMapping("/locMast/group")
+ private void group(){
+ int i=1;
+ for(int row=1;row<17;row++){//鍒�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",1).le("row1",3));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",5).le("row1",8));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",9).le("row1",11));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",13).le("row1",16));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",17).le("row1",19));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",21).le("row1",24));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",25).le("row1",27));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ for(int row=1;row<17;row++){//鎺�
+ for (int lev=1;lev<8;lev++){//灞�
+ String s="group1="+i;
+ locMastService.updateForSet(s,new EntityWrapper<LocMast>().eq("bay1",row).eq("lev1",lev).ge("row1",29).le("row1",31));
+ i++;
+ }
+ }
+ System.out.println("i="+i);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1