Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java

@@ -14,6 +14,11 @@ public class DictBizConstant {
 	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 PDA_AUDIO = "pda_audio";//PDA扫码语音
 
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java

@@ -238,6 +238,13 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	private Integer source;
 
 
+	/**
+	 * 定位打卡地址
+	 */
+	@ApiModelProperty(value = "定位打卡地址")
+	private String deliveryState;
+
+
 
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -24,6 +24,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigInteger;
+
 /**
  * 在库订单包件清单 实体类
  *
@@ -167,7 +169,7 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 * 品牌ID
 	 */
 	@ApiModelProperty(value = "品牌ID")
-	private String brandId;
+	private Long brandId;
 	/**
 	 * 品牌名称
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java

@@ -203,17 +203,13 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "类型;1 预约单  2库存单")
 	private Integer genre;
-	/**
-	 * 状态;1 配送 2 待配送 3部分入库 4已入库
-	 */
-	@ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库")
-	private String orderStatus;
-	/**
-	 * 状态;1 配送 2 待配送 3部分入库 4已入库
-	 */
-	@ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库")
-	@TableField(exist = false)
-	private String stateName;
+
+//	/**
+//	 * 状态;1 配送 2 待配送 3部分入库 4已入库
+//	 */
+//	@ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库")
+//	@TableField(exist = false)
+//	private String stateName;
 
 	/**
 	 * 状态;1 已通知 2 未通知
@@ -267,17 +263,9 @@ public class DistributionStockArticleEntity extends TenantEntity {
 
 
 
-	/**
-	 * 包件数量
-	 */
-	@TableField(exist = false)
-	private List<DistributionParcelListEntity> packageList;
 
-	/**
-	 * 订单是否出现包件修改
-	 */
-	@TableField(exist = false)
-	private Boolean isUpdate = false;
+
+
 
 	//-------------2023-07-16 新增在库订单字段
 
@@ -351,11 +339,7 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "签收件数")
 	private Integer signinQuantity;
 
-	/**
-	 * 上架状态（0未上架  1部分上架  2已上架 3已下架）
-	 */
-	@ApiModelProperty(value = "上架状态")
-	private Integer groundingStatus;
+
 
 	/**
 	 * 货位信息
@@ -400,11 +384,27 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	@ApiModelProperty(value = "盘点人id")
 	private Long inventoryPersonId;
 
+	@ApiModelProperty(value = "冻结状态")
+	private String freezeStatus;
 	/**
-	 * 冻结状态0未冻结 1已冻结
+	 * 上架状态
 	 */
-	@ApiModelProperty(value = "冻结状态0未冻结 1已冻结")
-	private Integer freezeStatus;
+	@ApiModelProperty(value = "上架状态")
+	private String groundingStatus;
+
+
+	@ApiModelProperty(value = "订单状态")
+	private String orderStatus;
+
+	@ApiModelProperty(value = "预约状态")
+	private String reservationStatus;
+
+	@ApiModelProperty(value = "备货状态")
+	private String stockupStatus;
+
+
+
+
 
 	/**
 	 * 有无数据源

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java

@@ -70,11 +70,28 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "服务类型    商   市  自")
 	private String typeServerName;
 
-	@ApiModelProperty(value = "订单状态")
-	private String orderStateName;
+
 	@ApiModelProperty(value = "上架状态名称")
 	private String groundingStatusName;
 
+
+	@ApiModelProperty(value = "冻结状态名称")
+	private String freezeStatusName;
+	/**
+	 * 上架状态
+	 */
+	@ApiModelProperty(value = "上架状态名称")
+	private String groundingStatus;
+
+	@ApiModelProperty(value = "订单状态名称")
+	private String orderStatusName;
+
+	@ApiModelProperty(value = "预约状态名称")
+	private String reservationStatusName;
+
+	@ApiModelProperty(value = "备货状态名称")
+	private String stockupStatusName;
+
 	/**
 	 * 是否齐套名称
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -102,7 +102,8 @@ public class DistributionStockupAppController extends BladeController {
 
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
 		map.put("consignee",reservationEntity.getConsignee());
-		map.put("goodsAreaName",reservationEntity.getGoodsAreaName());
+		String stockupArea = distributionStockupService.selectStockupAreaByReservationId(reservationEntity.getId());
+		map.put("goodsAreaName",stockupArea);
 		if(orderStatus.equals(1)) {
 			//查询客户订单对应的
 			List<DistributionStockupOrderListVO> list = distributionStockupService.selectStockupOrderList(stockupDTO);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -40,7 +40,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
-import wrapper.DistributionParcelListWrapper;
+import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 
 import java.util.Map;
 import java.util.List;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -244,7 +244,7 @@ public class DistributionReservationController extends BladeController {
 	}
 
 	/**
-	 * 预约列表 详情
+	 * 查询预约单订单列表
 	 */
 	@GetMapping("/getReservationPackage")
 	@ApiOperationSupport(order = 1)
@@ -255,7 +255,7 @@ public class DistributionReservationController extends BladeController {
 	}
 
 	/**
-	 * 预约列表 详情
+	 * 查询预约单包件信息列表
 	 */
 	@GetMapping("/getReservationPackageList")
 	@ApiOperationSupport(order = 1)
@@ -264,4 +264,15 @@ public class DistributionReservationController extends BladeController {
 		R<?> reservationPackage = reservationService.getReservationPackageList(reservationId);
 		return reservationPackage;
 	}
+
+	/**
+	 * 预约列表 详情
+	 */
+	@GetMapping("/getReservationStockListInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distrbutionReservation")
+	public R<?> getReservationStockListInfo(@RequestParam String reservationId) {
+		R<?> reservationPackage = reservationService.getReservationStockListInfo(reservationId);
+		return reservationPackage;
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
@@ -39,19 +38,15 @@ import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.system.cache.DictBizCache;
-import org.springblade.system.entity.DictBiz;
-import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
-import wrapper.DistributionStockArticleWrapper;
+import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 配送在库订单 控制器

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationDTO.java

@@ -54,13 +54,13 @@ public class DistributionReservationDTO extends DistributionReservationEntity {
 	 * 库存品信息列表
 	 */
 	@ApiModelProperty(value = "库存品信息列表")
-	private List<DistributionStockListEntity> inventoryList;
+	private List<DistributionStockListDTO> inventoryList;
 
 	/**
 	 * 订单信息列表
 	 */
 	@ApiModelProperty(value = "订单信息列表")
-	private List<DistributionStockArticleEntity> stockArticleList;
+	private List<DistributionStockArticleDTO> stockArticleList;
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleDTO.java

@@ -16,7 +16,9 @@
  */
 package com.logpm.distribution.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,12 +40,24 @@ public class DistributionStockArticleDTO extends DistributionStockArticleEntity
 
 	private String ids;
 
+//
+//	/**
+//	 * 包件信息
+//	 */
+//	@ApiModelProperty(value = "包件信息")
+//	private List<DistributionParcelListDTO> distributionParcelListDTO;
 
 	/**
-	 * 包件信息
+	 * 订单是否出现包件修改
 	 */
-	@ApiModelProperty(value = "包件信息")
-	private List<DistributionParcelListDTO> distributionParcelListDTO;
+	@TableField(exist = false)
+	private Boolean isUpdate = false;
+
+	/**
+	 * 包件数量
+	 */
+	@TableField(exist = false)
+	private List<DistributionParcelListEntity> packageList;
 
 
 }

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionReservationDTO;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.vo.DistributionReservationVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
@@ -106,4 +107,11 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @return
 	 */
 	DistributionReservationEntity selectByConsignee(String k);
+
+	/**
+	 * 查询预约单下的库存品信息
+	 * @param reservationId
+	 * @return
+	 */
+	List<DistributionStockListEntity> getReservationStockListInfo(@Param("reservationId") String reservationId);
 }

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

@@ -114,7 +114,7 @@
         ldsa.customer_telephone,
         ldsa.customer_address,
         ldsa.genre,
-        ldsa.state,
+        ldsa.order_status,
         ldsa.notification,
         ldsa.fee,
         ldsa.rate,
@@ -422,5 +422,69 @@
             </if>
         </where>
     </select>
+    <select id="getReservationStockListInfo"
+            resultType="com.logpm.distribution.entity.DistributionStockListEntity">
+        SELECT
+            ldsl.tenant_id,
+            ldsl.id,
+             ldsl.create_user,
+             ldsl.create_time,
+             ldsl.update_user,
+             ldsl.update_time,
+             ldsl.status,
+             ldsl.is_deleted,
+             ldsl.create_dept,
+             ldsl.reserve1,
+             ldsl.reserve2,
+             ldsl.reserve3,
+             ldsl.reserve4,
+             ldsl.reserve5,
+             ldsl.order_self_numbering,
+             ldsl.incoming_batch,
+             ldsl.service_number,
+             ldsl.material_id,
+             ldsl.description_goods,
+             ldsl.cargo_number,
+             ldsl.cargo_norms,
+             ldsl.cargo_unit,
+             ldsl.warehouse_id,
+             ldsl.warehouse_name,
+             ldsl.storage_location,
+             ldsl.mall_id,
+             ldsl.mall_code,
+             ldsl.mall_name,
+             ldsl.quantity_stock,
+             ldsl.store_id,
+             ldsl.store_code,
+             ldsl.store_name,
+             ldsl.quantity_occupied,
+             ldsl.outbound_quantity,
+             ldsl.despatch,
+             ldsl.stock_article_id,
+             ldsl.factory,
+             ldsl.category,
+             ldsl.unpack,
+             ldsl.parcel_list_id,
+             ldsl.shopping_mall,
+             ldsl.market_id,
+             ldsl.market_name,
+             ldsl.market_code,
+             ldsl.stock_list_code,
+             ldsl.service_type,
+             ldsl.pid,
+             ldsl.brand_name,
+             ldsl.brand_id,
+             ldsl.warehousing_time,
+             ldsl.unpacking_quantity,
+             ldsl.license_plate,
+             ldsl.tray_id,
+             ldsl.tray_name,
+             ldsl.sku
+        FROM
+            logpm_distribution_reservation_stocklist AS ldrs
+            INNER JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id
+        WHERE
+            reservation_id = #{reservationId}
+    </select>
 
 </mapper>

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

@@ -38,7 +38,11 @@
         <result column="customer_telephone" property="customerTelephone"/>
         <result column="customer_address" property="customerAddress"/>
         <result column="genre" property="genre"/>
-        <result column="state" property="state"/>
+        <result column="order_status" property="orderStatus"/>
+        <result column="freeze_status" property="freezeStatus"/>
+        <result column="grounding_status" property="groundingStatus"/>
+        <result column="reservation_status" property="reservationStatus"/>
+        <result column="stockup_status" property="stockupStatus"/>
         <result column="fee" property="fee"/>
         <result column="stock_article_code" property="stockArticleCode"/>
         <!--        <result column="reservation_id" property="reservationId"/>-->

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

@@ -104,7 +104,7 @@
                ldsl.storage_location warehouseArea,
                ldsl.tray_name trays,
                ldsl.sku sku,
-               ldsl.unit unit,
+               ldsl.cargo_unit unit,
                count(s.id) scanNum
         from logpm_distribution_reservation ldr
                  left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0
@@ -120,7 +120,7 @@
                  ldsl.storage_location,
                  ldsl.tray_name,
                  ldsl.sku,
-                 ldsl.unit
+                 ldsl.cargo_unit
 
     </select>
 

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

@@ -28,7 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 备货信息表 Mapper 接口
@@ -111,4 +110,5 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 */
 	DistributionStockupVO getDeliveryStockupInfo(@Param("id")String id);
 
+	String selectStockupAreaByReservationId(@Param("reservationId") Long id);
 }

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

@@ -244,4 +244,15 @@
             ldsi.stockup_id =#{id}
         </where>
     </select>
+
+
+    <select id="selectStockupAreaByReservationId" resultType="String">
+        select lwga.headline
+        from logpm_distribution_stockup_info ldsi
+        left join logpm_distribution_stockup lds on lds.id = ldsi.stockup_id and lds.is_deleted = 0
+        left join logpm_warehouse_goods_area lwga on lwga.id = lds.goods_area_id and lwga.is_deleted = 0
+        where ldsi.reservation_id = #{reservationId}
+        and ldsi.is_deleted = 0
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -157,4 +157,11 @@ public interface IDistributionReservationService extends BaseService<Distributio
 
     Integer getReservationNumByReservationIdAndStockListId(Long reservationId, Long stockListId);
 
+	/**
+	 * 查询预约单下的库存品信息
+	 * @param reservationId
+	 * @return
+	 */
+	R<?> getReservationStockListInfo(String reservationId);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -100,4 +100,5 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 
 	List<String> createPackageCode(Long reservationId, Long stockListId, Integer packageNum);
 
+	String selectStockupAreaByReservationId(Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -202,9 +202,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//获取新增预约信息的编号
 		Long reservationId = reservationEntity.getId();
 		//货区订单列表信息
-		List<DistributionStockArticleEntity> stockArticleList = distributionReservationDTO.getStockArticleList();
+		List<DistributionStockArticleDTO> stockArticleList = distributionReservationDTO.getStockArticleList();
 		//获取库存品列表信息
-		List<DistributionStockListEntity> inventoryList = distributionReservationDTO.getInventoryList();
+		List<DistributionStockListDTO> inventoryList = distributionReservationDTO.getInventoryList();
 		//订单数量统计
 		AtomicInteger stockArticleCount = new AtomicInteger();
 
@@ -252,6 +252,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						distributionReservationPackageMapper.insert(distributionReservationPackageEntity);
 						packageNum.getAndAdd(p.getQuantity());
 						p.setOrderPackageStatus(ServiceConstant.PACKAGE_STATUS_RESERVATION);
+//						p.setBrandId(p.getBrandId());
 						distributionParcelListService.updateById(p);
 					});
 					//设置订单可用数量为
@@ -262,6 +263,22 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				//修改订单状态为已预约
 				s.setOrderStatus(ServiceConstant.ORDER_STATE_ALREADY_RESERVATION);
 				stockArticleCount.getAndAdd(s.getReservationNum());
+				DistributionStockArticleEntity stockArticleEntity = Func.copy(s, DistributionStockArticleEntity.class);
+//				if (stockArticleEntity.getStoreId()==-1){
+//
+//				}
+//				if (stockArticleEntity.getMallId()==-1){
+//
+//				}
+//				if (stockArticleEntity.getFee().equals(-1)){
+//
+//				}
+//				if (stockArticleEntity.getStoreId()==-1){
+//
+//				}
+//				if (stockArticleEntity.getStoreId()==-1){
+//
+//				}
 				distributionStockArticleService.updateById(s);
 				//拼接订单自编号
 				arrayList.add(s.getOrderSelfNumbering());
@@ -742,13 +759,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		AtomicReference<BigDecimal> initTotal = new AtomicReference<>(BigDecimal.ZERO);
 		//订单自编号拼接
 		HashSet<String> hashSet = new HashSet<>();
-		List<DistributionStockArticleEntity> stockArticleList = distributionReservationDTO.getStockArticleList();
+		List<DistributionStockArticleDTO> stockArticleList = distributionReservationDTO.getStockArticleList();
 		if (!Func.isEmpty(stockArticleList)) {
 			//这里判断修改内容是否存在订单信息，如果存在则进行中间表数据的重新插入
 			stockArticleList.forEach(s -> {
 				List<DistributionParcelListEntity> packageList = s.getPackageList();
 				AtomicInteger packageNum = new AtomicInteger();
-				if (packageList.size() == 0) {
+				if (Func.isEmpty(packageList)) {
 					Map<String, Object> map = new HashMap<>();
 					map.put("stockArticleId", s.getId());
 					QueryWrapper<DistributionParcelListEntity> qw = Condition.getQueryWrapper(map, DistributionParcelListEntity.class);
@@ -787,7 +804,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStockarticleEntity.setReservationId(distributionReservationEntity.getId());
 				distributionReservationStockarticleService.save(distributionReservationStockarticleEntity);
 				packageCount.getAndAdd(distributionReservationStockarticleEntity.getReservationNum());
-
 				//统计订单包件数量
 				//订单到付费用
 				initTotal.getAndAccumulate(new BigDecimal(s.getCollectFee().toString()), BigDecimal::add);
@@ -798,7 +814,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				hashSet.add(s.getOrderSelfNumbering());
 			});
 		}
-		List<DistributionStockListEntity> inventoryList = distributionReservationDTO.getInventoryList();
+		List<DistributionStockListDTO> inventoryList = distributionReservationDTO.getInventoryList();
 		AtomicInteger stockListNum = new AtomicInteger();
 		if (!Func.isEmpty(inventoryList)) {
 			//重新构建预约和库存之间的关系
@@ -1125,4 +1141,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	public Integer getReservationNumByReservationIdAndStockListId(Long reservationId, Long stockListId) {
 		return baseMapper.getReservationNumByReservationIdAndStockListId(reservationId,stockListId);
 	}
+
+	@Override
+	public R<?> getReservationStockListInfo(String reservationId) {
+		List<DistributionStockListEntity> stockListEntityList = baseMapper.getReservationStockListInfo(reservationId);
+		return R.data(stockListEntityList);
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -90,7 +90,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
 		List<DistributionStockArticleVO> distributionStockArticleVOS = baseMapper.selectDistributionStockArticlePage(page, distributionStockArticle);
 		distributionStockArticleVOS.forEach(t->{
-			t.setOrderStateName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus()));
+			t.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, t.getOrderStatus()));
 
 		});
 		return page.setRecords(distributionStockArticleVOS);
@@ -308,7 +308,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		distributionStockListEntity.setStoreCode(Optional.ofNullable(distributionStockArticleEntity.getStoreCode()).orElse(null));//门店编码
 		distributionStockListEntity.setStoreName(Optional.ofNullable(distributionStockArticleEntity.getStoreName()).orElse(null));//门店名称
 		distributionStockListEntity.setFactory(Optional.ofNullable(distributionStockArticleEntity.getFactoryTrain()).orElse(null));//工厂车次
-		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));//品分类
+		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null).toString());//品分类
 		distributionStockListEntity.setUnpackingQuantity(0);
 		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null));
 		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(distributionParcelList.getMaterialId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -432,4 +432,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return ls;
 	}
 
+	@Override
+	public String selectStockupAreaByReservationId(Long id) {
+		return baseMapper.selectStockupAreaByReservationId(id);
+	}
+
 }

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

@@ -1,4 +1,4 @@
-package wrapper;
+package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
@@ -6,7 +6,6 @@ import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.system.cache.DictBizCache;
-import org.springframework.beans.BeanUtils;
 
 import java.util.Objects;
 

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

@@ -1,4 +1,4 @@
-package wrapper;
+package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
@@ -45,13 +45,12 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 				distributionStockupVO.setCompleteSetName("是");
 				break;
 		}
-
 		distributionStockupVO.setTypeServerName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, entity.getTypeService()));
-
-
-		distributionStockupVO.setOrderStateName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, entity.getOrderStatus()));
+		distributionStockupVO.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, entity.getOrderStatus()));
 		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()));
 
 
 		return distributionStockupVO;

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package wrapper;
+package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.vo.DistributionStockupVO;

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -408,7 +408,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setCustomerName(customerName);
 
 				distributionStockArticleEntity.setGenre(1);
-				distributionStockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_ONE);
+
 				distributionStockArticleEntity.setAdvanceId(advanceId);
 				//--------------2023-07-06 新增字段处理
 				//查询包条码对应的运单信息
@@ -435,7 +435,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				distributionStockArticleEntity.setDeliveryQuantity(0); //配送件数
 				distributionStockArticleEntity.setTransferQuantity(0); //中转件数
 				distributionStockArticleEntity.setSigninQuantity(0); //签收件数
-				distributionStockArticleEntity.setFreezeStatus(0); //冻结状态0未冻结 1已冻结
+				distributionStockArticleEntity.setFreezeStatus("10"); //冻结状态
+				distributionStockArticleEntity.setReservationStatus("10"); //预约状态
+				distributionStockArticleEntity.setStockupStatus("10"); //备货状态
+				distributionStockArticleEntity.setGroundingStatus("10"); //上架状态
+				distributionStockArticleEntity.setOrderStatus(ServiceConstant.ORDER_STATE_ONE);
+
 
 				id = distributionStockArticleClient.addData(distributionStockArticleEntity);
 				if(id == 0){