From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 2ffa057..07317fb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -60,6 +60,27 @@
private Long docType;
/**
+ * 绌烘澘鍑哄簱鏁伴噺
+ */
+ @ApiModelProperty(value= "绌烘澘鍑哄簱鏁伴噺")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 鍖哄煙鍦板潃
+ */
+ @ApiModelProperty(value= "鍖哄煙鍦板潃")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * AGV鐩爣绔欑偣
+ */
+ @ApiModelProperty(value= "AGV鐩爣绔欑偣")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
* 椤圭洰缂栧彿
*/
@ApiModelProperty(value= "椤圭洰缂栧彿")
@@ -96,12 +117,6 @@
@ApiModelProperty(value= "瀹㈡埛缂栧彿")
private Long cstmr;
- /**
- * 瀹㈡埛
- */
- @ApiModelProperty(value= "瀹㈡埛")
- @TableField("cstmr_name")
- private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
@@ -150,12 +165,6 @@
@TableField("act_fee")
private Double actFee;
- /**
- * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
- */
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
- @TableField("pay_type")
- private Integer payType;
/**
* 涓氬姟鍛�
@@ -206,13 +215,6 @@
@ApiModelProperty(value= "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
-
- /**
- * 鐗╂祦鍗曞彿
- */
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
- @TableField("ship_code")
- private String shipCode;
/**
* 璁㈠崟鐘舵��
@@ -268,6 +270,13 @@
@ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
@TableField("move_status")
private Integer moveStatus;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
public OrderPakout() {}
@@ -401,6 +410,18 @@
return null;
}
+ public String getPakinPakoutStatus$(){
+ switch (this.pakinPakoutStatus){
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1