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 | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 0b61146..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
@@ -60,12 +60,6 @@
private Integer ioType;
/**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- private Integer crnNo;
-
- /**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
@@ -186,13 +180,27 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "oveMk")
+ private String oveMk;
+
+ @ApiModelProperty(value= "invWh")
+ private String invWh;
+
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ private Integer crnNo;
+
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public WrkMast() {}
- public WrkMast(Integer wrkNo,Long wrkSts,Integer ioType,Integer crnNo,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 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;
- this.crnNo = crnNo;
this.ioPri = ioPri;
this.locNo = locNo;
this.staNo = staNo;
@@ -215,9 +223,13 @@
this.barcode = barcode;
this.fullPlt = fullPlt;
this.hostId = hostId;
+ this.oveMk = oveMk;
+ this.invWh = invWh;
+ this.crnNo = crnNo;
+ this.owner = owner;
}
-// WrkMast wrkMast = new WrkMast(
+ // WrkMast wrkMast = new WrkMast(
// null, // 宸ヤ綔鍙穂闈炵┖]
// null, // 宸ヤ綔鐘舵��
// null, // 鍏ュ嚭搴撶被鍨�
@@ -246,6 +258,7 @@
// null // 鎺堟潈鍟嗘埛
// );
+
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
--
Gitblit v1.9.1