From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 111 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 22fcbdb..ac93681 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
-import com.core.exception.CoolException;
+import com.zy.common.utils.Synchro;
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;
@@ -39,6 +36,58 @@
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
+ /**
+ * 璇ュ瓧娈垫槸缁勬墭鍏ュ簱鑷姩鍑哄彂琛ョ┖鎵樼洏鏍囪
+ * item_num
+ * 0锛氫笉闇�瑕佽ˉ绌烘墭鐩�
+ * 1锛氬皬鎵樼洏
+ * 2锛氬ぇ鎵樼洏
+ * 10锛氬皬鎵樼洏AGV浠诲姟涓嬪彂鎴愬姛
+ * 20锛氬ぇ鎵樼洏AGV浠诲姟涓嬪彂鎴愬姛
+ * 100锛氬皬鎵樼洏鏀捐揣瀹屾垚
+ * 200锛氬ぇ鎵樼洏鏀捐揣瀹屾垚
+ */
+ @ApiModelProperty(value= "澶у皬鎵樼洏")
+ @TableField("item_num")
+ private String itemNum;
+ /**
+ * agv鐘舵��
+ * be_batch
+ * 0锛氭棤闇�璋冪敤AGV
+ * 1锛氱瓑寰呰皟鐢ˋGV
+ * 2锛欰GV浠诲姟涓嬪彂鎴愬姛
+ * 3锛欰GV浠诲姟瀹屾垚
+ * 4锛氱粰杈撻�佺嚎涓嬪彂鍏ュ簱鎸囦护瀹屾垚
+ */
+
+ @ApiModelProperty(value= "agv鐘舵��")
+ @TableField("be_batch")
+ private Integer beBatch = 0;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ private String sku;
+
+ /**
+ * 鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
+ */
+ @ApiModelProperty(value= "鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�")
+ private String origin;
+
+
+
+ @ApiModelProperty(value= "鍙戠粰AGV鐨勪换鍔″彿")
+ private String supp;
+
+ @ApiModelProperty(value= "浠撳簱")
+ private String brand;
+
+ @ApiModelProperty(value= "鍞竴鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -52,17 +101,11 @@
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
@ApiModelProperty(value= "鍗曚綅")
private String unit;
@ApiModelProperty(value= "鍗曚环")
private Double price;
-
- @ApiModelProperty(value= "sku")
- private String sku;
@ApiModelProperty(value= "鍗曚綅閲�")
private Double units;
@@ -70,19 +113,12 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
@ApiModelProperty(value= "鍘傚")
private String manu;
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- @TableField("item_num")
- private String itemNum;
@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
@@ -101,17 +137,6 @@
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- @TableField("supp_code")
- private String suppCode;
-
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- @TableField("be_batch")
- private Integer beBatch;
-
@ApiModelProperty(value= "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
@@ -124,7 +149,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -181,15 +206,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -219,23 +244,7 @@
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 void sync(Object source) {
+ Synchro.Copy(source, this);
}
-
}
--
Gitblit v1.9.1