经纬度解析工具

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;
+	}
+}

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;
+	}
+}

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;
+	}
+}

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;
+	}
+}

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
 	 */

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<>();