From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001 From: Administrator <876263681@qq.com> Date: 星期三, 02 七月 2025 15:12:43 +0800 Subject: [PATCH] #优化库位检索 --- src/main/java/com/zy/asrs/entity/WaitPakin.java | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index 168eba7..5e8bcb3 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -1,15 +1,16 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; -import com.core.exception.CoolException; +import com.core.common.SpringUtils; +import com.zy.common.utils.Synchro; +import com.zy.system.entity.User; +import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.beans.BeanInfo; -import java.beans.Introspector; -import java.beans.PropertyDescriptor; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @@ -20,6 +21,7 @@ private static final long serialVersionUID = 1L; + @TableId("zpallet") @ApiModelProperty(value= "鎵樼洏鏉$爜") private String zpallet; @@ -30,12 +32,14 @@ @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @TableId("matnr") + @ApiModelProperty(value= "鍝佸彿") private String matnr; - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value= "鍝佸悕") private String maktx; + @TableId("batch") @ApiModelProperty(value= "鎵瑰彿") private String batch; @@ -52,7 +56,8 @@ @ApiModelProperty(value= "棰滆壊") private String color; - @ApiModelProperty(value= "鍝佺墝") + @ApiModelProperty(value= "绫诲瀷") +// @ApiModelProperty(value= "鍝佺墝") private String brand; @ApiModelProperty(value= "鍗曚綅") @@ -155,6 +160,10 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + @ApiModelProperty(value= "bom鍙�") + @TableField("bom_code") + private String bomCode; + public String getBeBatch$(){ if (null == this.beBatch){ return null; } switch (this.beBatch){ @@ -219,23 +228,16 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - public void sync(Object dest) { - try { - BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class); - PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors(); - BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class); - PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors(); - for (PropertyDescriptor propertyDescriptor : sourceProperty) { - for (PropertyDescriptor descriptor : destProperty) { - if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) { - descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this)); - break; - } - } - } - } catch (Exception e) { - throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage()); + public String getAppeUser$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.appeUser); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getUsername()); } + return null; } + public void sync(Object source) { + Synchro.Copy(source, this); + } } -- Gitblit v1.9.1