From dc82588470049e47e68dae6c30bc47e48a4af816 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 09:51:02 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index fe454d0..5e86238 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -4,8 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -87,7 +91,7 @@
* 鎵瑰彿
*/
@ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ private String batch = "1";
/**
* 瑙勬牸
@@ -393,6 +397,12 @@
this.memo = memo;
}
+ //灏忔澗椤圭洰鏃犳壒娆★紝榛樿1鏂逛究鍚庣画淇敼
+ public void setBatch(String batch) {
+ this.batch = batch == null ? "1" : batch;
+ }
+
+
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
@@ -451,6 +461,16 @@
return String.valueOf(this.danger);
}
}
+
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
@@ -526,6 +546,24 @@
return "鏈畬鎴�";
}
+ public String getBoxType1$(){
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)){
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$(){
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)){
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
public boolean beSimilar(OrderDetlPakout orderDetlPakout){
return (
this.orderNo.equals(orderDetlPakout.getOrderNo())
--
Gitblit v1.9.1