From 1da663cb65e7bb2abc782faeed3cc893c3d7ca27 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Mon, 4 Sep 2023 14:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E8=A7=A3=E6=9E=90?=
=?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InventoryBindingStatusConstant.java | 45 +++++++++++++++++++
.../InventoryLoadingStatusConstant.java | 45 +++++++++++++++++++
.../InventorySigningStatusConstant.java | 45 +++++++++++++++++++
.../Inventory/InventoryTypeConstant.java | 45 +++++++++++++++++++
.../entity/DisStockListDetailEntity.java | 6 +++
.../DistributionDeliveryListServiceImpl.java | 6 +++
6 files changed, 192 insertions(+)
create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryBindingStatusConstant.java
create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryLoadingStatusConstant.java
create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventorySigningStatusConstant.java
create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryTypeConstant.java
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryBindingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryBindingStatusConstant.java
new file mode 100644
index 000000000..55eaadb0a
--- /dev/null
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryBindingStatusConstant.java
@@ -0,0 +1,45 @@
+package org.springblade.common.constant.Inventory;
+
+/**
+ * 库存品绑定状态
+ * 关联码表 order_package_status
+ *
+ * @author pref
+ */
+public enum InventoryBindingStatusConstant {
+
+ weibangding("未绑定", "10"),
+ yibangding("已绑定", "20");
+
+ /**
+ * 状态
+ */
+ private String name;
+
+ /**
+ * 值
+ */
+ private String value;
+
+
+ private InventoryBindingStatusConstant(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryLoadingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryLoadingStatusConstant.java
new file mode 100644
index 000000000..af1013754
--- /dev/null
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryLoadingStatusConstant.java
@@ -0,0 +1,45 @@
+package org.springblade.common.constant.Inventory;
+
+/**
+ * 订单包件状态
+ * 关联码表 order_package_status
+ *
+ * @author pref
+ */
+public enum InventoryLoadingStatusConstant {
+
+ weizhuancghe("未装车", "10"),
+ yizhuangche("已装车", "20");
+
+ /**
+ * 状态
+ */
+ private String name;
+
+ /**
+ * 值
+ */
+ private String value;
+
+
+ private InventoryLoadingStatusConstant(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventorySigningStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventorySigningStatusConstant.java
new file mode 100644
index 000000000..7d0a87ed9
--- /dev/null
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventorySigningStatusConstant.java
@@ -0,0 +1,45 @@
+package org.springblade.common.constant.Inventory;
+
+/**
+ * 订单包件状态
+ * 关联码表 order_package_status
+ *
+ * @author pref
+ */
+public enum InventorySigningStatusConstant {
+
+ weiqianshou("未签收", "10"),
+ yiqianshou("已签收", "20");
+
+ /**
+ * 状态
+ */
+ private String name;
+
+ /**
+ * 值
+ */
+ private String value;
+
+
+ private InventorySigningStatusConstant(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryTypeConstant.java
new file mode 100644
index 000000000..98e4eddc5
--- /dev/null
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/Inventory/InventoryTypeConstant.java
@@ -0,0 +1,45 @@
+package org.springblade.common.constant.Inventory;
+
+/**
+ * 库存品绑定状态
+ * 关联码表 order_package_status
+ *
+ * @author pref
+ */
+public enum InventoryTypeConstant {
+
+ saoma("扫码", "10"),
+ shoudong("手动", "20");
+
+ /**
+ * 状态
+ */
+ private String name;
+
+ /**
+ * 值
+ */
+ private String value;
+
+
+ private InventoryTypeConstant(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DisStockListDetailEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DisStockListDetailEntity.java
index 7fe9f6da7..0c8ad406b 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DisStockListDetailEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DisStockListDetailEntity.java
@@ -86,6 +86,12 @@ public class DisStockListDetailEntity extends TenantEntity {
*/
@ApiModelProperty(value = "数量")
private Integer num;
+
+ /**
+ * 预约库存品中间表Id
+ */
+ @ApiModelProperty(value = "预约库存品中间表Id")
+ private Long reservationStockListId;
/**
* 预留1
*/
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index c2660036e..c6ae807b9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -1120,6 +1120,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
}
boolean b = false;
+
+ //根据传递进来的库存品条码进行库存品的校验
+ //获取之前的
+ String barcode = distrilbutionloadingscanDTO.getBarcode();
+
+
// if (distrilbutionloadingscanDTO.getInventorytype() == 3) {
//无拆包
List<DistributionLoadscaninvnEntity> distributionLoadscanvnEntities = new ArrayList<>();