From d04fe2f4e7fc1f46ef4e85e640eefdd9127b4db3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 15:01:48 +0800
Subject: [PATCH] 入库单功能优化
---
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 028ef39..34cb220 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -4,9 +4,10 @@
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.OrderService;
+import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -17,6 +18,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_order_detl_pakin")
@@ -414,7 +416,22 @@
}
}
+ 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;
+ }
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ Tag tag = tagService.selectOne(new EntityWrapper<Tag>().eq("id", order.getTagId()));
+ if (!Objects.isNull(tag)){
+ return tag.getName();
+ }
+ return null;
+ }
+
public String getPakinPakoutStatus$(){
+ if (Objects.isNull(pakinPakoutStatus)) {return null;}
switch (this.pakinPakoutStatus){
case 1:
return "Y";
@@ -464,6 +481,7 @@
}
}
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -512,9 +530,6 @@
if (null != this.anfme && this.workQty != null) {
return this.anfme - this.workQty;
}
-// if (null != this.anfme && this.qty != null) {
-// return this.anfme - this.qty;
-// }
return null;
}
@@ -525,6 +540,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(OrderDetlPakin orderDetlPakin){
return (
this.orderNo.equals(orderDetlPakin.getOrderNo())
--
Gitblit v1.9.1