From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..9baa9f5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -1,10 +1,12 @@
package com.zy.asrs.entity;
+import com.alibaba.fastjson.JSON;
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.zy.asrs.service.*;
+import com.zy.common.model.DetlDto;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -14,7 +16,9 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_mast")
@@ -64,6 +68,20 @@
@ApiModelProperty(value= "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 绌挎杞�
+ */
+ @ApiModelProperty(value= "绌挎杞�")
+ @TableField("ste_no")
+ private Integer steNo;
+
+ /**
+ * 杈圭紭搴撲綅
+ */
+ @ApiModelProperty(value= "杈圭紭搴撲綅")
+ @TableField("out_most")
+ private Integer outMost;
@ApiModelProperty(value= "")
@TableField("sheet_no")
@@ -321,6 +339,11 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
public WrkMast() {}
public String getYmd$(){
@@ -398,6 +421,43 @@
return String.valueOf(locMast.getLocNo());
}
return null;
+ }
+ public String getOrderNo$(){
+ WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(this.wrkNo);
+ String orderNo = "";
+ List<String> resultRecords = new ArrayList<>();
+ if (!Cools.isEmpty(wrkDetls) && wrkDetls.size()!=0){
+ if (wrkDetls.get(0).getOrderNo() != null) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ String orderNo$ = "";
+ if(!wrkDetl.getOrderNo().startsWith("[") || !wrkDetl.getOrderNo().endsWith("]")) {
+ return wrkDetl.getOrderNo();
+ } else {
+ JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
+ resultRecords.add(detlDto.getOrderNo());
+ });
+ }
+ }
+
+ }
+ int size = resultRecords.size();
+ int i = 1;
+ for (String resultRecord : resultRecords) {
+
+
+ if (size == i) {
+ orderNo += resultRecord;
+ } else {
+ orderNo += resultRecord + ";";
+ }
+
+
+ i++;
+ }
+ return String.valueOf(orderNo);
+ }
+ return "";
}
public String getIoTime$(){
@@ -479,13 +539,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
}
public String getLogErrTime$(){
--
Gitblit v1.9.1