diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java
index d8e7ed9f3..8ddaa29b7 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java
@@ -12,12 +12,16 @@ public class DictBizConstant {
public static final String DEFAULT_DEPT_ID = "default_dept_id";//默认部门ID
public static final String DELIVERY_ORDER_STATUS = "order_status";//配送订单状态
- public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
+
public static final String BASIC_GROUNDING = "basic_grounding";//上架状态
public static final String STOCKUP_STATUS = "stockup_status";//备货状态
public static final String RESERVATION_STATUS = "reservation_status";//预约状态
+ public static final String ORDER_PACKAGE_STATUS = "order_package_status";//配送包件状态
+ public static final String ORDER_PACKAGE_FREEZE_STATUS = "order_package_freeze_status";//包间冻结状态
+
+
public static final String PDA_AUDIO = "pda_audio";//PDA扫码语音
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
index d31805b5b..16806c553 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
@@ -85,6 +85,7 @@ public class DistributionParcelListEntity extends TenantEntity {
* 包条码
*/
@ApiModelProperty(value = "包条码")
+ @TableField("order_package_code")
private String packetBarCode;
@ApiModelProperty(value = "货区信息")
@@ -186,6 +187,12 @@ public class DistributionParcelListEntity extends TenantEntity {
@ApiModelProperty(value = "包件状态")
private String orderPackageStatus;
+ @ApiModelProperty(value = "包件冻结状态")
+ private String orderPackageFreezeStatus;
+
+
+
+
// /**
// * 配送状态
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 1bfca5aba..0f800bb16 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -44,6 +44,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
* 包件状态名称
*/
private String orderPackageStatusName;
+ /**
+ * 包件冻结状态
+ */
+ private String orderPackageFreezeStatusName;
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 9eab15829..b01ef8687 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -20,13 +20,15 @@
-
+
-
+
+
+
@@ -52,7 +54,7 @@