From 083841bb6c40097e19b17022454fcc7f12b7f092 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 02 八月 2025 08:59:49 +0800
Subject: [PATCH] 1.更换订单出库策略，走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
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);
--
Gitblit v1.9.1