From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java | 320 +++++++++++++++-------------------------------------
1 files changed, 93 insertions(+), 227 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
index 9b3a3b2..6739620 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
@@ -1,27 +1,9 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +20,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -47,270 +30,153 @@
private Long uuid;
/**
- * 宸ヤ綔鍙�
+ * 鍗峰彿
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
+ @ApiModelProperty(value= "鍗峰彿")
+ @TableField("roll_no")
+ private String rollNo;
/**
- * 鍙戠敓鏃堕棿
+ * 閲嶉噺
*/
- @ApiModelProperty(value= "鍙戠敓鏃堕棿")
- @TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date startTime;
+ @ApiModelProperty(value= "閲嶉噺")
+ @TableField("roll_weight")
+ private String rollWeight;
/**
- * 缁撴潫鏃堕棿
+ * 闀垮害
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
+ @ApiModelProperty(value= "闀垮害")
+ @TableField("roll_length")
+ private String rollLength;
/**
- * 宸ヤ綔鐘舵��
+ * 瀹藉害
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
+ @ApiModelProperty(value= "瀹藉害")
+ @TableField("roll_width")
+ private String rollWidth;
/**
- * 鍏ュ嚭搴撶被鍨�
+ * 鍘氬害
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableField("io_type")
- private Integer ioType;
+ @ApiModelProperty(value= "鍘氬害")
+ @TableField("roll_thickness")
+ private String rollThickness;
/**
- * 鍫嗗灈鏈�
+ * 鍗风姸鎬�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- @TableField("crn_no")
- private Integer crnNo;
+ @ApiModelProperty(value= "鍗风姸鎬�")
+ @TableField("roll_status")
+ private Integer rollStatus;
/**
- * plc
+ * 鍖呰鍙�
*/
- @ApiModelProperty(value= "plc")
- @TableField("plc_no")
- private Integer plcNo;
+ @ApiModelProperty(value= "鍖呰鍙�")
+ @TableField("roll_papeage_no")
+ private Integer rollPapeageNo;
/**
- * 鐩爣搴撲綅
+ * 杞﹀彿
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("loc_no")
- private String locNo;
+ @ApiModelProperty(value= "杞﹀彿")
+ @TableField("roll_car_no")
+ private Integer rollCarNo;
/**
- * 鐩爣绔�
+ * 閲戦
*/
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("sta_no")
- private Integer staNo;
+ @ApiModelProperty(value= "閲戦")
+ @TableField("roll_amount")
+ private String rollAmount;
/**
- * 婧愮珯
+ * 瀹㈡埛Id
*/
- @ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta_no")
- private Integer sourceStaNo;
+ @ApiModelProperty(value= "瀹㈡埛Id")
+ @TableField("roll_custom_id")
+ private Integer rollCustomId;
/**
- * 婧愬簱浣�
+ * 鍘傚尯
*/
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("source_loc_no")
- private String sourceLocNo;
+ @ApiModelProperty(value= "鍘傚尯")
+ @TableField("roll_factory")
+ private Integer rollFactory;
/**
- * 鏉＄爜
+ * 澶囩敤1
*/
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1;
/**
- * 寮傚父鐮�
+ * 澶囩敤2
*/
- @ApiModelProperty(value= "寮傚父鐮�")
- @TableField("err_code")
- private Integer errCode;
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2;
/**
- * 寮傚父
+ * 澶囩敤3
*/
- @ApiModelProperty(value= "寮傚父")
- private String error;
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 澶囩敤4
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
- private Integer status;
+ @ApiModelProperty(value= "澶囩敤4")
+ private String standby4;
/**
- * 娣诲姞鏃堕棿
+ * 澶囩敤5
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ @ApiModelProperty(value= "澶囩敤5")
+ private String standby5;
/**
- * 娣诲姞浜哄憳
+ * 澶囩敤6
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- @TableField("create_by")
- private Long createBy;
+ @ApiModelProperty(value= "澶囩敤6")
+ private String standby6;
/**
- * 淇敼鏃堕棿
+ * 澶囩敤7
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ @ApiModelProperty(value= "澶囩敤7")
+ private String standby7;
/**
- * 淇敼浜哄憳
+ * 澶囩敤8
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "澶囩敤8")
+ private String standby8;
public LocDetlRullUpDetail() {}
- public LocDetlRullUpDetail(Long uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public LocDetlRullUpDetail(Long uuid,String rollNo,String rollWeight,String rollLength,String rollWidth,String rollThickness,Integer rollStatus,Integer rollPapeageNo,Integer rollCarNo,String rollAmount,Integer rollCustomId,Integer rollFactory,String standby1,String standby2,String standby3,String standby4,String standby5,String standby6,String standby7,String standby8) {
this.uuid = uuid;
- this.wrkNo = wrkNo;
- this.startTime = startTime;
- this.endTime = endTime;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.plcNo = plcNo;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.barcode = barcode;
- this.errCode = errCode;
- this.error = error;
- this.status = status;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
+ this.rollNo = rollNo;
+ this.rollWeight = rollWeight;
+ this.rollLength = rollLength;
+ this.rollWidth = rollWidth;
+ this.rollThickness = rollThickness;
+ this.rollStatus = rollStatus;
+ this.rollPapeageNo = rollPapeageNo;
+ this.rollCarNo = rollCarNo;
+ this.rollAmount = rollAmount;
+ this.rollCustomId = rollCustomId;
+ this.rollFactory = rollFactory;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
+ this.standby4 = standby4;
+ this.standby5 = standby5;
+ this.standby6 = standby6;
+ this.standby7 = standby7;
+ this.standby8 = standby8;
}
-
-// LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail(
-// null, // 缂栧彿
-// null, // 宸ヤ綔鍙�
-// null, // 鍙戠敓鏃堕棿
-// null, // 缁撴潫鏃堕棿
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // plc
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 鏉＄爜
-// null, // 寮傚父鐮�
-// null, // 寮傚父
-// null, // 寮傚父鎯呭喌
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
- }
-
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- public String getWrkSts$(){
- BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
- return String.valueOf(basWrkStatus.getWrkDesc());
- }
- return null;
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "鏈鐞�";
- case 2:
- return "宸蹭慨澶�";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
}
--
Gitblit v1.9.1