From 0430c84aa26eaaad039803dad9c24d55f36b3050 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 20:29:28 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 15 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 15 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java | 15 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java | 4
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 34 +++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 1
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 4
zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 16 ----
zy-asrs-wms/src/main/webapp/static/js/common.js | 1
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java | 15 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 15 ----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 15 ----
zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html | 2
17 files changed, 44 insertions(+), 117 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
index 5018466..a8ae070 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
@@ -20,7 +20,7 @@
private String locno;
// 璐т富
- private Integer owner;
+ private String owner;
//缁勬墭鐗╂枡
private List<CombMat> combMats;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 4ba1d22..a816f62 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -200,11 +200,11 @@
private Long hostId;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public LocDetl() {}
- public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
+ public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -296,18 +296,6 @@
return String.valueOf(locMast.getLocNo());
}
return null;
- }
-
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
}
public String getModiUser$(){
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index 02b460e..9eabd34 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -168,11 +168,11 @@
private String pic;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public LocMast() {}
- public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, Integer owner) {
+ public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, String owner) {
this.locNo = locNo;
this.whsType = whsType;
this.locSts = locSts;
@@ -234,17 +234,6 @@
return null;
}
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
- }
public String getLocSts$(){
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
index bc6ebab..a203c24 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
@@ -272,11 +272,11 @@
private String fullPlt;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WaitPakin() {}
- public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
+ public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.zpallet = zpallet;
this.anfme = anfme;
this.locNo = locNo;
@@ -377,17 +377,6 @@
}
}
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
- }
public String getFullPlt$(){
if (null == this.fullPlt){ return null; }
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
index 348c12b..7aedfbb 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
@@ -269,11 +269,11 @@
private String fullPlt;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WaitPakinLog() {}
- public WaitPakinLog(Long id,String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
+ public WaitPakinLog(Long id,String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.id = id;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -374,17 +374,6 @@
return "鍚�";
default:
return String.valueOf(this.beBatch);
- }
- }
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
index dbcab24..75dc80c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
@@ -287,11 +287,11 @@
private Long wrkMastId;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WrkDetl() {}
- public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
+ public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.wrkNo = wrkNo;
this.ioTime = ioTime;
this.anfme = anfme;
@@ -383,17 +383,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
}
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
index a2b1b0c..288966d 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
@@ -284,11 +284,11 @@
private Long wrkMastId;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WrkDetlLog() {}
- public WrkDetlLog(Long id,Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,Integer owner) {
+ public WrkDetlLog(Long id,Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.id = id;
this.wrkNo = wrkNo;
this.ioTime = ioTime;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
index 14ae9ee..a9cf142 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
@@ -193,11 +193,11 @@
private String pic;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WrkMast() {}
- public WrkMast(Integer wrkNo, Long wrkSts, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String picking, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String modiUser, Date modiTime, String appeUser, Date appeTime, Date errorTime, String errorMemo, String manuType, String memo, String barcode, String fullPlt, Long hostId, String oveMk, String invWh, Integer crnNo,Integer owner) {
+ public WrkMast(Integer wrkNo, Long wrkSts, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String picking, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String modiUser, Date modiTime, String appeUser, Date appeTime, Date errorTime, String errorMemo, String manuType, String memo, String barcode, String fullPlt, Long hostId, String oveMk, String invWh, Integer crnNo,String owner) {
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
@@ -258,17 +258,6 @@
// null // 鎺堟潈鍟嗘埛
// );
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
- }
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
index 26f4914..0ddea3a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
@@ -191,11 +191,11 @@
@ApiModelProperty(value= "鎷嶇収鍥剧墖")
private String pic;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WrkMastLog() {}
- public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId,Integer owner) {
+ public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId,String owner) {
this.id = id;
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
@@ -254,17 +254,6 @@
// null, // 婊℃澘(checkBox)
// null // 鎺堟潈鍟嗘埛
// );
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
- }
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
index 7265ae4..1bc9fa3 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
@@ -29,6 +29,9 @@
<if test="map.anfme!=null and map.anfme!='' ">
and a.anfme like '%' + #{map.anfme} + '%'
</if>
+ <if test="map.owner!=null and map.owner!='' ">
+ and a.owner like '%' + #{map.owner} + '%'
+ </if>
<if test="map.startTime!=null and map.endTime!=null">
and a.modi_time between #{map.startTime} and #{map.endTime}
</if>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 96bbc1e..9d68acd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.LocDetl;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
index 344322b..1b3cd36 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WcsController.java
@@ -109,7 +109,7 @@
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
String batch = waitPakins.get(0).getBatch();
- Integer owner = waitPakins.get(0).getOwner();
+ String owner = waitPakins.get(0).getOwner();
StartupDto dto = commonService.getLocNo(1, devpNo, matNos, batch, hostId, locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index 04283ca..c1b98e0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.WrkMastService;
@@ -36,25 +37,24 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WrkMast::getWrkNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMast::getIoTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMast::getIoTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("wrk_no"))) {
- wrapper.eq(WrkMast::getWrkNo, param.get("wrk_no"));
- }
- if (!Cools.isEmpty(param.get("wrk_sts"))) {
- wrapper.eq(WrkMast::getWrkSts, param.get("wrk_sts"));
- }
+ excludeTrash(param);
+ QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id",getHostId());
+ convert(param, wrapper);
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
-
+ private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
+ 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 {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
@RequestMapping(value = "/wrkMast/add/auth")
@ManagerAuth
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index f16f134..79c9a9c 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -231,6 +231,7 @@
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'owner', align: 'center',title: '璐т富'}
,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
index 27fc924..4cc1bc2 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -34,7 +34,7 @@
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
- ,{field: 'owner$', align: 'center',title: '璐т富'}
+ ,{field: 'owner', align: 'center',title: '璐т富'}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
index f7cd111..a84a64a 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -65,7 +65,7 @@
html += ">";
return html;
}}
- ,{field: 'owner$', align: 'center',title: '璐т富'}
+ ,{field: 'owner', align: 'center',title: '璐т富'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
request: {
@@ -561,7 +561,7 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'owner$', align: 'center',title: '璐т富'}
+ ,{field: 'owner', align: 'center',title: '璐т富'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:50}
]],
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index 16d7558..7282b31 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -20,7 +20,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰呯紪鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1