From 6d3b7e69524cdc6fd4c44fe9f37661a19a56c6ff Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 21:08:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index bea7bdc..00c536b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -156,7 +157,7 @@
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value= "浠撳簱缂栫爜")
private String manu;
/**
@@ -337,21 +338,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
@ApiModelProperty(value= "澶囨敞")
@TableField("remark")
@@ -584,6 +585,32 @@
);
}
+
+ public String getStandby1$() {
+ StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+ StoreType storeType = service.selectById(this.standby1);
+ if (!Cools.isEmpty(storeType)) {
+ return String.valueOf(storeType.getStoreName());
+ }
+ return null;
+ }
+
+
+ public boolean beSimilar2(OrderDetl orderDetl){
+ return (
+ this.orderNo.equals(orderDetl.getOrderNo())
+ && this.matnr.equals(orderDetl.getMatnr())
+ && this.brand.equals(orderDetl.getBrand())
+ && this.standby1.equals(orderDetl.getStandby1())
+ && this.standby2.equals(orderDetl.getStandby2())
+ && this.standby3.equals(orderDetl.getStandby3())
+ && this.boxType1.equals(orderDetl.getBoxType1())
+ && this.boxType2.equals(orderDetl.getBoxType2())
+ && this.boxType3.equals(orderDetl.getBoxType3())
+ );
+ }
+
+
public static OrderDetl find(List<OrderDetl> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
if (Cools.isEmpty(matnr)) {
return null;
--
Gitblit v1.9.1