From 4188991b66415e591b636dd304340b9d4674dcdf Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期三, 30 七月 2025 14:47:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java index 381ee05..578938a 100644 --- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java +++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java @@ -7,9 +7,7 @@ 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.OrderService; +import com.zy.asrs.service.*; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -352,6 +350,9 @@ @TableField("box_type3") private String boxType3 = ""; + //搴撳瓨鐘舵�� + private Integer cstateid; + public OrderDetlPakin() {} public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) { @@ -546,6 +547,17 @@ return this.boxType1; } + + 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 beSimilar(OrderDetlPakin orderDetlPakin){ return ( this.orderNo.equals(orderDetlPakin.getOrderNo()) @@ -561,6 +573,15 @@ ); } + public String getCstateid$() { + KcztMapService service = SpringUtils.getBean(KcztMapService.class); + KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid)); + if (!Cools.isEmpty(kcztMap)){ + return String.valueOf(kcztMap.getVname()); + } + return String.valueOf(this.cstateid); + } + public void sync(Object source) { Synchro.Copy(source, this); } -- Gitblit v1.9.1