From 9b6a50bf1288d2f7f06a67bec0c902d1256e44fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 05 七月 2025 11:15:54 +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