From 18e03c72291dfcb9cebc3a21ab276bec4a0b262e Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 16:25:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 366 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 270 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 69eb8d2..be6b481 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -1,9 +1,9 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
@@ -11,7 +11,7 @@
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -27,310 +27,317 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @Schema(description = "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
- private Integer wrkNo;
+ private Long wrkNo;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
private String mk;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @Schema(description = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @Schema(description = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @Schema(description = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* RGV鍙�
*/
- @ApiModelProperty(value= "RGV")
+ @Schema(description = "RGV")
@TableField("rgv_no")
private Integer rgvNo;
/**
- * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鏈媶 1: 宸叉媶 2:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
+ * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鍒濆 1銆佹湭鎷嗗凡涓婃姤 2: 宸叉媶 3:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
*/
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @Schema(description = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("wrk_date")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @Schema(description = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @Schema(description = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @Schema(description = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @Schema(description = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
/**
* RGV婧愮珯
*/
- @ApiModelProperty(value= "RGV婧愮珯")
+ @Schema(description = "RGV婧愮珯")
@TableField("rgv_ssta_no")
private Integer rgvSstaNo;
/**
* RGV鐩爣绔�
*/
- @ApiModelProperty(value= "RGV鐩爣绔�")
+ @Schema(description = "RGV鐩爣绔�")
@TableField("rgv_dsta_no")
private Integer rgvDstaNo;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @Schema(description = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @Schema(description = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @Schema(description = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @Schema(description = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
private String packed;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @Schema(description = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @Schema(description = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("ref_wrkno")
private Double refWrkno;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @Schema(description = "鎷ｆ枡鏃堕棿")
@TableField("ref_iotime")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @Schema(description = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @Schema(description = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("manu_type")
private String manuType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @Schema(description = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @Schema(description = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @Schema(description = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @Schema(description = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
+
+ /**
+ * 浼寸敓宸ヤ綔鍙�
+ */
+ @Schema(description = "浼寸敓宸ヤ綔鍙�")
+ @TableField("work_no_other")
+ private Integer workNoOther;
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
@@ -357,15 +364,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getCrnNo$(){
- BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
- return String.valueOf(basCrnp.getCrnNo());
- }
- return null;
- }
-
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
@@ -373,18 +371,9 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
+ BasDevp basDevp = service.getById(this.staNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -393,18 +382,9 @@
public String getSourceStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
+ BasDevp basDevp = service.getById(this.sourceStaNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
}
return null;
}
@@ -453,7 +433,7 @@
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.getById(this.modiUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -469,7 +449,7 @@
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.getById(this.appeUser);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getUsername());
}
@@ -508,4 +488,198 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public Integer getIoTypeMes$(){
+ if (this.ioType != 101){
+ return 3;
+ } else {
+ return 1;
+ }
+ }
+
+ public Integer getStaNoCs(int[] autoZ){
+ switch (staNo){
+ case 114:
+ case 115:
+ case 116:
+ case 117:
+ case 118:
+ return 102;
+ case 120:
+ case 121:
+ case 122:
+ return 104;
+ case 124:
+ case 125:
+ case 126:
+ return 106;
+ case 128:
+ case 129:
+ case 130:
+ return 108;
+ case 133:
+ return 111;
+ case 102:
+ switch (autoZ[0]){
+ case 0:
+ autoZ[0]++;
+ return 114;
+ case 1:
+ autoZ[0]++;
+ return 115;
+ case 2:
+ autoZ[0]++;
+ return 116;
+ case 3:
+ autoZ[0]++;
+ return 117;
+ default:
+ autoZ[0] = 0;
+ return 118;//117
+ }
+ case 104:
+ switch (autoZ[1]){
+ case 0:
+ autoZ[1]++;
+ return 120;
+ case 1:
+ autoZ[1]++;
+ return 121;
+ default:
+ autoZ[1] = 0;
+ return 122;//121
+ }
+ case 106:
+ switch (autoZ[2]){
+ case 0:
+ autoZ[2]++;
+ return 124;
+ case 1:
+ autoZ[2]++;
+ return 125;
+ default:
+ autoZ[2] = 0;
+ return 126;//125
+ }
+ case 108:
+ switch (autoZ[3]){
+ case 0:
+ autoZ[3]++;
+ return 128;
+ case 1:
+ autoZ[3]++;
+ return 129;
+ default:
+ autoZ[3] = 0;
+ return 130;
+ }
+ case 111:
+ return 133;
+ }
+ return 0;
+ }
+ public Integer getStaNoCs(){
+ switch (staNo){
+ case 114:
+ return 102;
+ case 120:
+ return 104;
+ case 124:
+ return 106;
+ case 128:
+ return 108;
+ case 133:
+ return 111;
+ case 102:
+ return 114;
+ case 104:
+ return 120;
+ case 106:
+ return 124;
+ case 108:
+ return 128;
+ case 111:
+ return 133;
+ }
+ return 0;
+ }
+
+ public Integer getSourceNoCs(int[] autoZ){
+ switch (sourceStaNo){
+ case 101:
+ switch (autoZ[4]){
+ case 0:
+ autoZ[4]++;
+ return 112;
+ default:
+ autoZ[4] = 0;
+ return 113;
+ }
+ case 103:
+ return 119;
+ case 105:
+ return 123;
+ case 107:
+ return 127;
+ case 109:
+ case 110:
+ case 111:
+ switch (autoZ[5]){
+ case 0:
+ autoZ[5]++;
+ return 131;
+ default:
+ autoZ[5] = 0;
+ return 132;
+ }
+ case 112:
+ case 113:
+ return 101;
+ case 119:
+ return 103;
+ case 123:
+ return 105;
+ case 127:
+ return 107;
+ case 131:
+ case 132:
+ switch (autoZ[6]){
+ case 0:
+ autoZ[6]++;
+ return 109;
+ case 1:
+ autoZ[6]++;
+ return 110;
+ default:
+ autoZ[6] = 0;
+ return 111;
+ }
+ }
+ return 0;
+ }
+ public Integer getSourceNoCs(){
+ switch (sourceStaNo){
+ case 101:
+ return 112;
+ case 103:
+ return 119;
+ case 105:
+ return 123;
+ case 107:
+ return 127;
+ case 109:
+ return 131;
+ case 112:
+ return 101;
+ case 119:
+ return 103;
+ case 123:
+ return 105;
+ case 127:
+ return 107;
+ case 131:
+ return 109;
+ }
+ return 0;
+ }
+
}
--
Gitblit v1.9.1