From a1dd6ff24f7cae0b529ad313ba07351c07965605 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 13:04:09 +0800
Subject: [PATCH] 管控线边仓库存
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index ad19b6d..17b1f8e 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -6,17 +6,14 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.service.OrderService;
+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 org.springframework.format.annotation.DateTimeFormat;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -58,10 +55,20 @@
/**
* 浣滀笟鏁伴噺
*
- * 1. 鍏ュ簱 : qty 馃憜
- * 1. 鍑哄簱 : qty 馃憜
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ *
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value= "瀹屾垚鏁伴噺")
private Double qty;
/**
@@ -125,7 +132,7 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 涓婃姤鏁伴噺
*/
@ApiModelProperty(value= "鍗曚綅閲�")
private Double units;
@@ -197,13 +204,13 @@
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "璋冩嫧婧愬簱浣�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value= "璋冩嫧鐩爣搴撲綅")
@TableField("supp_code")
private String suppCode;
@@ -229,16 +236,16 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ * 鏄惁涓婃姤 1: 鏄� 0: 鍚� 2: 绛夊緟涓婃姤
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ @ApiModelProperty(value= "鏄惁涓婃姤 1: 鏄� 0: 鍚� 2: 绛夊緟涓婃姤")
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -290,7 +297,7 @@
public OrderDetl() {}
- public OrderDetl(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 length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer check, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetl(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 length, 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) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -322,7 +329,7 @@
this.deadTime = deadTime;
this.deadWarn = deadWarn;
this.source = source;
- this.check = check;
+ this.inspect = inspect;
this.danger = danger;
this.status = status;
this.createBy = createBy;
@@ -367,15 +374,17 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
- case 1:
- return "鏄�";
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 0:
- return "鍚�";
+ return "鏈笂鎶�";
+ case 1:
+ return "宸蹭笂鎶�";
+ case 2:
+ return "寰呬笂鎶�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -436,30 +445,24 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ 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;
}
- 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 getQty$(){
+ if (getAnfme().equals(getQty())){
+ return "宸插畬鎴�";
}
+ return "鏈畬鎴�";
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1