From 3517e7db959feedc80882c920e6c2bd2d1765e02 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 19 Aug 2023 21:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/vo/DistributionStockArticleVO.java  |  5 +++++
 .../mapper/DistributionParcelListMapper.java         |  2 ++
 .../mapper/DistributionParcelListMapper.xml          |  3 +++
 .../service/IDistributionParcelListService.java      |  7 +++++++
 .../impl/DistributionParcelListServiceImpl.java      |  5 +++++
 .../impl/DistrilbutionBillLadingServiceImpl.java     |  8 ++++----
 .../wrapper/DistributionStockArticleWrapper.java     | 12 ++++++++++--
 7 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
index 4c208a244..a4c626e3d 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
@@ -59,6 +59,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	 */
 	@ApiModelProperty(value = "托盘")
 	private String pallet;
+	/**
+	 * 托盘
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String orderPackageCode;
 	/**
 	 * 货位信息
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
index 3078474ac..6a1abcf54 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
@@ -75,4 +75,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 
 
 	void updateOrderGroundingStatus(@Param("orderCode") String orderCode, @Param("groundingStatus") String groundingStatus);
+
+    String getOrderPackageCode(@Param("id")Long id);
 }
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 99d571a84..a93df353b 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
@@ -54,6 +54,9 @@
             where ldpl.stock_article_id = #{param.stockArticleId}  and ldpl.is_deleted = '0'
         )
     </select>
+    <select id="getOrderPackageCode" resultType="String">
+
+    </select>
 
     <select id="exportDistributionParcelList" resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
         SELECT * FROM logpm_distribution_parcel_list ${ew.customSqlSegment}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index dc5ee5bf3..74c4a9320 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -77,6 +77,13 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	void updateOrderStatus(String orderPackageCode,String type);
 
 	List<DistributionParcelListBaseVO> getStockDataBase(Map<String, Object> distributionParcelList);
+
+	/**
+	 * 查询包条码
+	 * @param id
+	 * @return
+	 */
+    String getOrderPackageCode(Long id);
     void updateGroundingStatus(String orderPackageCode, String groundingStatus);
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 2b64b48a8..549cd070c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -156,4 +156,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		});
 		return stockDataBase;
 	}
+
+	@Override
+	public String getOrderPackageCode(Long id) {
+		return baseMapper.getOrderPackageCode(id);
+	}
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 7a86fb52a..ad2bf96f4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -346,8 +346,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//查询已有的数据
 		List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
 			.eq(DistrilbutionBillStockEntity::getBillLadingId, id)
-			.eq(DistrilbutionBillStockEntity::getOrderStatus, "1")
-			.or(wp -> wp.eq(DistrilbutionBillStockEntity::getBillLadingId, id).eq(DistrilbutionBillStockEntity::getOrderStatus, "2"))
+			.apply("order_status in ( 1,2)")
+			.or(wp -> wp.eq(DistrilbutionBillStockEntity::getBillLadingId, id).apply("order_status in ( 1,2)"))
 		);
 		List<DistrilbutionBillStockEntity> deList = new ArrayList<>();
 		list.forEach(i -> {
@@ -374,7 +374,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		//删除提货订单状态
 		deList.forEach(i -> {
 			//查询数据是否已备货
-			if (!i.getConditions().equals("2")) {
+			if (i.getConditions().equals("10") ) {
 				//未
 				List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda().eq(DistributionStockEntity::getStockArticle, i.getStockArticleId()));
 				if (list1.size() == 0) {
@@ -385,6 +385,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
 					distributionStockArticleService.updateById(stockArticleEntity);
 				}
+				i.setOrderStatus("3");
 				distrilbutionBillStockService.updateById(i);
 			}
 		});
@@ -403,7 +404,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distrilbutionBillStock.setConditions(BillLadingStatusConstant.daitihuo.getValue());
 			distrilbutionBillStock.setOrderStatus("2");
 			list1.add(distrilbutionBillStock);
-
 		});
 		distrilbutionBillStockService.saveBatch(list1);
 		//查询当前备货任务
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
index 0506b20b1..9e2817207 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java
@@ -1,6 +1,8 @@
 package com.logpm.distribution.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.service.IDistributionParcelListService;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -18,6 +20,7 @@ import java.util.Objects;
 public class DistributionStockArticleWrapper extends BaseEntityWrapper<DistributionStockArticleEntity
 	, DistributionStockArticleVO> {
 	private IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
+	private IDistributionParcelListService distributionParcelListService;
 
 
 	public static DistributionStockArticleWrapper build() {
@@ -29,7 +32,9 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 	public DistributionStockArticleVO entityVO(DistributionStockArticleEntity entity) {
 
 		DistributionStockArticleVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(entity, DistributionStockArticleVO.class));
-
+		// 查询包条码
+	/*	String orderPackageCode = distributionParcelListService.getOrderPackageCode(distributionStockupVO.getId());
+		distributionStockupVO.setOrderPackageCode( orderPackageCode);*/
 		//计算在库天数
 		long time1 = entity.getWarehouseEntryTime().getTime(); //入库
 		long time2 = new Date().getTime(); // 现在
@@ -58,7 +63,10 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 		distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS, distributionStockupVO.getFreezeStatus()));
 		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RESERVATION_STATUS, distributionStockupVO.getReservationStatus()));
 		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS, distributionStockupVO.getStockupStatus()));
-		distributionStockupVO.setCreateUserName(userCliient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());
+		if(ObjectUtils.isNotNull(distributionStockupVO.getCreateUser())){
+			distributionStockupVO.setCreateUserName(userCliient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());
+		}
+
 		distributionStockupVO.setOrderReceiveStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RECEIVE_STATUS, distributionStockupVO.getOrderReceiveStatus()));
 		return distributionStockupVO;
 	}