1.增加包件的冻结状态

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扫码语音
 

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;
+
+
+
+
 
 //	/**
 //	 * 配送状态

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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -20,13 +20,15 @@
         <result column="reserve5" property="reserve5"/>
         <result column="warehouse" property="warehouse"/>
         <result column="conditions" property="conditions"/>
-        <result column="packet_bar_code" property="packetBarCode"/>
+        <result column="order_package_code" property="packetBarCode"/>
         <result column="goods_allocation" property="goodsAllocation"/>
         <result column="pallet" property="pallet"/>
         <result column="firsts" property="firsts"/>
         <result column="second" property="second"/>
         <result column="third_product" property="thirdProduct"/>
-        <result column="material" property="material"/>
+        <result column="material_id" property="materialId"/>
+        <result column="material_name" property="materialName"/>
+        <result column="material_code" property="materialCode"/>
         <result column="quantity" property="quantity"/>
         <result column="train_number" property="trainNumber"/>
         <result column="stock_article_id" property="stockArticleId"/>
@@ -52,7 +54,7 @@
 
     <select id="selectOrderInfoList" resultType="com.logpm.distribution.vo.PackageStockupVO">
         select ldpl.order_self_numbering orderCode,
-               ldpl.packet_bar_code packageBarCode,
+               ldpl.order_package_code packageBarCode,
                1 goodsType,
                IF(t.id is null,0,1) isScan,
                s.id scanId
@@ -89,7 +91,7 @@
         group by ldpl.pallet
     </select>
     <select id="getParcelListOwn" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
-        select DISTINCT  ldpl.id, ldpl.packet_bar_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
+        select DISTINCT  ldpl.id, ldpl.order_package_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
                         lds.stockup_status stockupStatus,lds.stockup_date stockupDate,
                         lds.stockup_area stockupArea,ldpl.goods_allocation goodsAllocation,ldpl.pallet
         from logpm_distribution_parcel_list ldpl

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 
 /**
  * @program: LogisticsPlatform-Service
- * @description:
+ * @description: 包件包装类
  * @author: cyz
  * @create: 2023-08-02 14:35
  **/
@@ -27,6 +27,7 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 		DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
 
 		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
+		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
 		return parcelListVO;
 	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -50,7 +50,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 		distributionStockupVO.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, entity.getGroundingStatus()));
 		distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS,entity.getFreezeStatus()));
 		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getReservationStatus()));
-		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS,entity.getStockupStatus()));
+		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,entity.getStockupStatus()));
 
 
 		return distributionStockupVO;