From 332420e29973a6768c50558df5775554882f6be7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 18:55:35 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 18 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 18 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java | 51 ++++++++----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java | 18 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java | 7 +
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 3
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html | 2
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 | 18 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java | 18 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 17 +++
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 | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 18 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java | 2
15 files changed, 169 insertions(+), 28 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 7c4c6bf..5018466 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
@@ -19,6 +19,9 @@
// 搴撲綅缂栧彿
private String locno;
+ // 璐т富
+ private Integer 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 d3150b6..4ba1d22 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
@@ -199,9 +199,12 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -241,6 +244,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// LocDetl locDetl = new LocDetl(
@@ -294,6 +298,18 @@
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$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.modiUser);
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 513cace..02b460e 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
@@ -167,9 +167,12 @@
@ApiModelProperty(value= "鎷嶇収鍥剧墖")
private String pic;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.locNo = locNo;
this.whsType = whsType;
this.locSts = locSts;
@@ -193,6 +196,7 @@
this.barcode = barcode;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// LocMast locMast = new LocMast(
@@ -230,6 +234,18 @@
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);
BasLocSts basLocSts = service.getById(this.locSts);
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 7a0e7f8..bc6ebab 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
@@ -271,9 +271,12 @@
@ApiModelProperty(value= "婊℃澘(checkBox)")
private String fullPlt;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.zpallet = zpallet;
this.anfme = anfme;
this.locNo = locNo;
@@ -315,6 +318,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// WaitPakin waitPakin = new WaitPakin(
@@ -373,6 +377,18 @@
}
}
+ 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; }
switch (this.fullPlt){
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 4b9102c..348c12b 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
@@ -268,9 +268,12 @@
@ApiModelProperty(value= "婊℃澘(checkBox)")
private String fullPlt;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.id = id;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -313,6 +316,8 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
+
}
// WaitPakinLog waitPakinLog = new WaitPakinLog(
@@ -371,6 +376,17 @@
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);
+ }
+ }
public String getSource$(){
if (null == this.source){ return null; }
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 dde883f..dbcab24 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
@@ -286,9 +286,12 @@
@ApiModelProperty(value= "宸ヤ綔妗D")
private Long wrkMastId;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.wrkNo = wrkNo;
this.ioTime = ioTime;
this.anfme = anfme;
@@ -329,6 +332,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkDetl wrkDetl = new WrkDetl(
@@ -380,7 +384,17 @@
}
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; }
switch (this.beBatch){
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 c2da70a..a2b1b0c 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
@@ -283,9 +283,12 @@
@ApiModelProperty(value= "宸ヤ綔妗D")
private Long wrkMastId;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.id = id;
this.wrkNo = wrkNo;
this.ioTime = ioTime;
@@ -327,6 +330,8 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
+
}
// WrkDetlLog wrkDetlLog = new WrkDetlLog(
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 c8b0a48..14ae9ee 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
@@ -192,9 +192,12 @@
@ApiModelProperty(value= "鎷嶇収鍥剧墖")
private String pic;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
@@ -223,6 +226,7 @@
this.oveMk = oveMk;
this.invWh = invWh;
this.crnNo = crnNo;
+ this.owner = owner;
}
// WrkMast wrkMast = new WrkMast(
@@ -254,6 +258,18 @@
// 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/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 a07bdd3..26f4914 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
@@ -190,10 +190,12 @@
@ApiModelProperty(value= "鎷嶇収鍥剧墖")
private String pic;
+ @ApiModelProperty(value= "璐т富")
+ private Integer 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) {
+ 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) {
this.id = id;
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
@@ -220,6 +222,7 @@
this.barcode = barcode;
this.fullPlt = fullPlt;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkMastLog wrkMastLog = new WrkMastLog(
@@ -251,7 +254,17 @@
// 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/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
index 4e626b3..858b673 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -100,6 +100,7 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
waitPakin.setFullPlt(param.getFullPlt());
+ waitPakin.setOwner(param.getOwner());
if (!waitPakinService.save(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -156,6 +157,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setOwner(param.getOwner());
if (!waitPakinService.save(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
index b276e64..c355fac 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocMastController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
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.domain.entity.Parameter;
import com.zy.asrs.common.domain.entity.Shelves;
@@ -21,6 +22,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+
+import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
public class LocMastController extends BaseController {
@@ -46,25 +49,41 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocMast::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocMast::getLocNo, condition);
- }
- if (!Cools.isEmpty(timeRange)) {
- String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
- }
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
- }
- if (!Cools.isEmpty(param.get("loc_sts"))) {
- wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
- }
+ excludeTrash(param);
+ QueryWrapper<LocMast> wrapper = new QueryWrapper<>();
+ wrapper.eq("host_id",getHostId());
+ //wrapper.eq(LocMast::getHostId, getHostId());
+ convert(param, wrapper);
+ //if (!Cools.isEmpty(condition)) {
+ // wrapper.like(LocMast::getLocNo, condition);
+ //}
+ //if (!Cools.isEmpty(timeRange)) {
+ // String[] range = timeRange.split(RANGE_TIME_LINK);
+ // wrapper.ge(LocMast::getAppeTime, DateUtils.convert(range[0]));
+ // wrapper.le(LocMast::getAppeTime, DateUtils.convert(range[1]));
+ //}
+ //if (!Cools.isEmpty(param.get("loc_no"))) {
+ // wrapper.eq(LocMast::getLocNo, param.get("loc_no"));
+ //}
+ //if (!Cools.isEmpty(param.get("loc_sts"))) {
+ // wrapper.eq(LocMast::getLocSts, param.get("loc_sts"));
+ //}
return R.ok(locMastService.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);
+ }
+ }
+ }
+
@PostMapping(value = "/group/empty/stock")
@ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
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 014183c..344322b 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,6 +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();
StartupDto dto = commonService.getLocNo(1, devpNo, matNos, batch, hostId, locTypeDto, 0);
int workNo = dto.getWorkNo();
Date now = new Date();
@@ -133,6 +134,7 @@
wrkMast.setModiTime(now);
wrkMast.setHostId(hostId);
wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setOwner(owner);
boolean res = wrkMastService.save(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
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 9a64af7..27fc924 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
@@ -29,10 +29,12 @@
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', 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 f64aee6..f7cd111 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: '璐т富'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
request: {
@@ -561,6 +561,7 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', 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/pakStore/locDetlQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
index 1c3708f..706089c 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -74,7 +74,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="memo" placeholder="缈诲寘" autocomplete="off">
+ <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1