From 3289e15f080302df2f6619e5d1606b95e7d8a988 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 16:19:58 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java | 13 ++++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java | 6 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java | 8 +++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java | 6 ++
zy-asrs-wms/src/main/webapp/static/js/rowLastno/rowLastno.js | 4 +-
zy-asrs-wms/src/main/webapp/views/wrkLastno/wrkLastno.html | 4 +-
zy-asrs-wms/src/main/webapp/views/rowLastno/rowLastno.html | 4 +-
zy-asrs-wms/src/main/webapp/static/js/wrkLastno/wrkLastno.js | 8 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java | 24 +++++++++---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java | 24 +++++++++---
10 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
index a4afa8b..13d245b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
@@ -68,6 +68,12 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
public BasWhs() {}
public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
index d34c801..067a1ed 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
@@ -30,10 +30,16 @@
private static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
* 绫诲埆
*/
@ApiModelProperty(value= "绫诲埆")
- @TableId(value = "whs_type", type = IdType.INPUT)
private Integer whsType;
/**
@@ -52,13 +58,13 @@
* 璧峰鎺掑彿
*/
@ApiModelProperty(value= "璧峰鎺掑彿")
- private Integer sRow;
+ private Integer startRow;
/**
* 缁堟鎺掑彿
*/
@ApiModelProperty(value= "缁堟鎺掑彿")
- private Integer eRow;
+ private Integer targetRow;
/**
* 鍫嗗灈鏈烘暟閲�
@@ -101,14 +107,20 @@
@ApiModelProperty(value= "")
private Integer limintLoc;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
public RowLastno() {}
- public RowLastno(Integer whsType,String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
+ public RowLastno(Integer whsType,String wrkMk,Integer currentRow,Integer startRow,Integer targetRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
this.whsType = whsType;
this.wrkMk = wrkMk;
this.currentRow = currentRow;
- this.sRow = sRow;
- this.eRow = eRow;
+ this.startRow = startRow;
+ this.targetRow = targetRow;
this.crnQty = crnQty;
this.memo = memo;
this.modiUser = modiUser;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
index 4cad339..5dd0df2 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
@@ -30,10 +30,16 @@
private static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
* 绫诲瀷
*/
@ApiModelProperty(value= "绫诲瀷")
- @TableId(value = "wrk_mk", type = IdType.INPUT)
private Integer wrkMk;
/**
@@ -72,13 +78,13 @@
* 璧峰ID
*/
@ApiModelProperty(value= "璧峰ID")
- private Integer sNo;
+ private Integer startNo;
/**
* 缁堟ID
*/
@ApiModelProperty(value= "缁堟ID")
- private Integer eNo;
+ private Integer targetNo;
/**
* 澶囨敞
@@ -86,17 +92,23 @@
@ApiModelProperty(value= "澶囨敞")
private String memoM;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
public WrkLastno() {}
- public WrkLastno(Integer wrkMk,Integer wrkNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer sNo,Integer eNo,String memoM) {
+ public WrkLastno(Integer wrkMk,Integer wrkNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer startNo,Integer targetNo,String memoM) {
this.wrkMk = wrkMk;
this.wrkNo = wrkNo;
this.modiUser = modiUser;
this.modiTime = modiTime;
this.appeUser = appeUser;
this.appeTime = appeTime;
- this.sNo = sNo;
- this.eNo = eNo;
+ this.startNo = startNo;
+ this.targetNo = targetNo;
this.memoM = memoM;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
index cf6cdc7..a201dd6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java
@@ -26,7 +26,7 @@
@RequestMapping(value = "/basWhs/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(basWhsService.getById(String.valueOf(id)));
+ return R.ok(basWhsService.getOne(new LambdaQueryWrapper<BasWhs>().eq(BasWhs::getId, Long.parseLong(id)).eq(BasWhs::getHostId, getHostId())));
}
@RequestMapping(value = "/basWhs/page/auth")
@@ -37,6 +37,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BasWhs::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(BasWhs::getWhsDesc, condition);
}
@@ -52,6 +53,7 @@
@RequestMapping(value = "/basWhs/add/auth")
@ManagerAuth
public R add(BasWhs basWhs) {
+ basWhs.setHostId(getHostId());
basWhsService.save(basWhs);
return R.ok();
}
@@ -79,6 +81,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BasWhs::getHostId, getHostId());
wrapper.like(BasWhs::getWhsDesc, condition);
Page<BasWhs> page = basWhsService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +99,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BasWhs::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(BasWhs::getWhsDesc, condition);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
index 0f4cf10..27d3af5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/RowLastnoController.java
@@ -25,8 +25,8 @@
@RequestMapping(value = "/rowLastno/{id}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(rowLastnoService.getById(String.valueOf(id)));
+ public R get(@PathVariable("id") Long id) {
+ return R.ok(rowLastnoService.getById(id));
}
@RequestMapping(value = "/rowLastno/page/auth")
@@ -37,6 +37,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(RowLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(RowLastno::getWhsType, condition);
}
@@ -52,6 +53,7 @@
@RequestMapping(value = "/rowLastno/add/auth")
@ManagerAuth
public R add(RowLastno rowLastno) {
+ rowLastno.setHostId(getHostId());
rowLastnoService.save(rowLastno);
return R.ok();
}
@@ -79,6 +81,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(RowLastno::getHostId, getHostId());
wrapper.like(RowLastno::getWhsType, condition);
Page<RowLastno> page = rowLastnoService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +99,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<RowLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(RowLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(RowLastno::getWhsType, condition);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
index a8a554b..0cd4fdd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
@@ -1,7 +1,5 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkLastno;
@@ -25,8 +23,8 @@
@RequestMapping(value = "/wrkLastno/{id}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkLastnoService.getById(String.valueOf(id)));
+ public R get(@PathVariable("id") Long id) {
+ return R.ok(wrkLastnoService.getById(id));
}
@RequestMapping(value = "/wrkLastno/page/auth")
@@ -37,6 +35,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkLastno::getWrkMk, condition);
}
@@ -45,13 +44,15 @@
wrapper.ge(WrkLastno::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WrkLastno::getAppeTime, DateUtils.convert(range[1]));
}
- return R.ok(wrkLastnoService.page(new Page<>(curr, limit), wrapper));
+ Page<WrkLastno> page = wrkLastnoService.page(new Page<>(curr, limit), wrapper);
+ return R.ok(page);
}
@RequestMapping(value = "/wrkLastno/add/auth")
@ManagerAuth
public R add(WrkLastno wrkLastno) {
+ wrkLastno.setHostId(getHostId());
wrkLastnoService.save(wrkLastno);
return R.ok();
}
@@ -79,6 +80,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
wrapper.like(WrkLastno::getWrkMk, condition);
Page<WrkLastno> page = wrkLastnoService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +98,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkLastno::getWrkMk, condition);
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/rowLastno/rowLastno.js b/zy-asrs-wms/src/main/webapp/static/js/rowLastno/rowLastno.js
index 8c70f56..b74a64a 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -27,8 +27,8 @@
,{field: 'whsType', align: 'center',title: '绫诲埆'}
,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿'}
- ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
- ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
+ ,{field: 'startRow', align: 'center',title: '璧峰鎺掑彿'}
+ ,{field: 'targetRow', align: 'center',title: '缁堟鎺掑彿'}
,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
// ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkLastno/wrkLastno.js b/zy-asrs-wms/src/main/webapp/static/js/wrkLastno/wrkLastno.js
index e72b9fe..e0c0c2c 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkLastno/wrkLastno.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkLastno/wrkLastno.js
@@ -30,8 +30,8 @@
// ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'sno', align: 'center',title: '璧峰ID'}
- ,{field: 'eno', align: 'center',title: '缁堟ID'}
+ ,{field: 'startNo', align: 'center',title: '璧峰ID'}
+ ,{field: 'targetNo', align: 'center',title: '缁堟ID'}
,{field: 'memoM', align: 'center',title: '澶囨敞'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
@@ -87,7 +87,7 @@
return;
}
del(checkStatus.map(function (d) {
- return d.wrkMk;
+ return d.id;
}));
break;
case 'exportData':
@@ -139,7 +139,7 @@
showEditModel(data);
break;
case "del":
- del([data.wrkMk]);
+ del([data.id]);
break;
}
});
diff --git a/zy-asrs-wms/src/main/webapp/views/rowLastno/rowLastno.html b/zy-asrs-wms/src/main/webapp/views/rowLastno/rowLastno.html
index 2f9b23c..a13e92d 100644
--- a/zy-asrs-wms/src/main/webapp/views/rowLastno/rowLastno.html
+++ b/zy-asrs-wms/src/main/webapp/views/rowLastno/rowLastno.html
@@ -88,13 +88,13 @@
<div class="layui-form-item">
<label class="layui-form-label">璧峰鎺掑彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="sRow" placeholder="璇疯緭鍏ヨ捣濮嬫帓鍙�">
+ <input class="layui-input" name="startRow" placeholder="璇疯緭鍏ヨ捣濮嬫帓鍙�">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">缁堟鎺掑彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="eRow" placeholder="璇疯緭鍏ョ粓姝㈡帓鍙�">
+ <input class="layui-input" name="targetRow" placeholder="璇疯緭鍏ョ粓姝㈡帓鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkLastno/wrkLastno.html b/zy-asrs-wms/src/main/webapp/views/wrkLastno/wrkLastno.html
index 742a17b..1003670 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkLastno/wrkLastno.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkLastno/wrkLastno.html
@@ -118,13 +118,13 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">璧峰ID: </label>
<div class="layui-input-block">
- <input class="layui-input" name="sNo" placeholder="璇疯緭鍏ヨ捣濮婭D" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="startNo" placeholder="璇疯緭鍏ヨ捣濮婭D" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">缁堟ID: </label>
<div class="layui-input-block">
- <input class="layui-input" name="eNo" placeholder="璇疯緭鍏ョ粓姝D" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="targetNo" placeholder="璇疯緭鍏ョ粓姝D" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1