From 56a859b798469cc877dc20118698c45c5e3c04cc Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 15 Jan 2024 14:18:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=B8=82=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=B2=A1=E6=9C=89=E7=89=A9=E6=96=99=E7=9A=84?=
 =?UTF-8?q?bug=202.=E5=B9=B2=E7=BA=BF=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TrunklineCarsOrderEntity.java      |  6 +-
 .../DistributionReservationPackageMapper.java |  4 +-
 .../DistributionReservationPackageMapper.xml  | 17 ++++
 ...DistributionReservationPackageService.java |  3 +
 .../DistributionDeliveryListServiceImpl.java  |  2 +
 ...ributionReservationPackageServiceImpl.java |  9 ++-
 .../controller/CarsLoadController.java        | 79 +++++++++++++++++++
 .../mapper/TrunklineCarsLoadMapper.xml        |  4 +-
 .../impl/TrunklineCarsLoadServiceImpl.java    |  1 -
 9 files changed, 111 insertions(+), 14 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java
index b4f7a5654..fe5dfede6 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsOrderEntity.java
@@ -63,7 +63,7 @@ public class TrunklineCarsOrderEntity extends TenantEntity {
 	private Integer type ;
 	/** 是否是直发商家 0否 1是 */
 	@ApiModelProperty(name = "是否是直发商家 0否 1是",notes = "")
-	private String isCustomer ;
+	private String isCustomer = "0" ;
 	/** 实际件数 */
 	@ApiModelProperty(name = "实际件数",notes = "")
 	private Integer realNum;
@@ -81,10 +81,6 @@ public class TrunklineCarsOrderEntity extends TenantEntity {
 	@ApiModelProperty(name = "发车数量",notes = "")
 	private Integer startNum;
 
-	/** 是否直发商家 0否 1是 */
-	@ApiModelProperty(name = "是否直发商家 0否 1是",notes = "")
-	private Integer isToMall;
-
 	/** 签收数量 */
 	@ApiModelProperty(name = "签收数量",notes = "")
 	private Integer signNum;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
index c919fee82..f76368e51 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionReservationPackageDTO;
@@ -29,7 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 预约包件中间表 Mapper 接口
@@ -145,6 +143,8 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 
     String getConcatThirdProductByOrderId(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId);
 
+    String getConcatMaterialName(@Param("reservationId") Long reservationId,@Param("stockArticleId") Long stockArticleId);
+
 //	/**
 //	 * 根据预约ID和订单ID查询预约包件中间表
 //	 * @param id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
index 7f52d55b5..8713b5085 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
@@ -399,4 +399,21 @@ WHERE
               group by ldpl.third_product) t
     </select>
 
+    <select id="getConcatMaterialName" resultType="String">
+        select GROUP_CONCAT(t.materialName)
+        from (SELECT
+                  CONCAT( ldpl.material_name, '(', count( ldpl.id ), ')' ) materialName
+              FROM
+                  logpm_distribution_reservation_package ldrp
+                      LEFT JOIN logpm_distribution_parcel_list ldpl ON ldrp.parce_list_id = ldpl.id
+              WHERE
+                  ldrp.reservation_id = #{reservationId}
+
+                AND ldrp.stock_article_id = #{stockArticleId}
+
+                AND ldrp.packet_bar_status != 2
+              GROUP BY
+                  ldpl.material_name) t
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
index 99bb0b3c9..2f1f9746f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
@@ -100,4 +100,7 @@ public interface IDistributionReservationPackageService extends BaseService<Dist
 	 * @return
 	 */
     boolean cancelReservationPackage(Long reservationId, Long packageId);
+
+    String getConcatMaterialName(Long reservationId, Long stockArticleId);
+
 }
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 cb5b215ed..4e488d54e 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
@@ -6433,10 +6433,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 					//查询产品名称拼接
 					String productName = distributionReservationPackageService.getConcatThirdProductByOrderId(reservationId, stockArticleId);
+					String materialNames = distributionReservationPackageService.getConcatMaterialName(reservationId,stockArticleId);
 
 					temp.put("产品名称", productName);
 					//todo 单位是否需要查询物料表
 					temp.put("单位", getUnit(distributionStockArticleEntity.getId()));
+					temp.put("物料名称", materialNames);
 					temp.put("数量", distributionReservationStockarticleEntity.getReservationNum());
 
 					temp.put("备货区", getStockupArea(distributionReservationEntity.getId()));
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
index 28cbf3e0b..ed5aaa2ad 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
@@ -17,8 +17,6 @@
 package com.logpm.distribution.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -41,8 +39,6 @@ import org.springblade.common.constant.orderpackage.OrderPackageReservationStatu
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -190,5 +186,10 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 		return true;
 	}
 
+	@Override
+	public String getConcatMaterialName(Long reservationId, Long stockArticleId) {
+		return baseMapper.getConcatMaterialName(reservationId,stockArticleId);
+	}
+
 
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
index 894442d92..8410d0405 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
@@ -1825,4 +1825,83 @@ public class CarsLoadController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/signPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "签收包件", notes = "传入loadCarsDTO")
+	public R signPackage(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############signPackage: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long signOrderId = loadCarsDTO.getSignOrderId();
+		String orderPackageCode = loadCarsDTO.getOrderPackageCode();
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(signOrderId)){
+				log.warn(method+"签收单Id为空 signOrderId={}",signOrderId);
+				return R.fail(405,"签收单Id为空");
+			}
+
+			if(StringUtil.isBlank(orderPackageCode)){
+				log.warn(method+"包件码为空 orderPackageCode={}",orderPackageCode);
+				return R.fail(405,"包件码为空");
+			}
+
+			return carsLoadService.signScanPackageCode(signOrderId,orderPackageCode,"PC签收");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
+	@ResponseBody
+	@PostMapping("/signZero")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "签收零担", notes = "传入loadCarsDTO")
+	public R signZero(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############signZero: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long signOrderId = loadCarsDTO.getSignOrderId();
+		Long carsLoadScanId = loadCarsDTO.getCarsLoadScanId();
+		Integer enterNum = loadCarsDTO.getEnterNum();
+
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(signOrderId)){
+				log.warn(method+"签收单Id为空 signOrderId={}",signOrderId);
+				return R.fail(405,"签收单Id为空");
+			}
+
+			if(Objects.isNull(carsLoadScanId)){
+				log.warn(method+"签收零担id为空 carsLoadScanId={}",carsLoadScanId);
+				return R.fail(405,"签收零担id为空");
+			}
+
+			return carsLoadService.signZeroOrder(signOrderId,carsLoadScanId,enterNum,"PC录入签收");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index fa1c69d54..58ab2f34e 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -433,7 +433,7 @@
             <if test="param.loadId != null">
                 and ltco.load_id = #{param.loadId}
             </if>
-            <if test="param.nodeId != null">
+            <if test="param.warehouseId != null">
                 and ltco.node_id = #{param.warehouseId}
                 and ldsa.warehouse_id = #{param.warehouseId}
             </if>
@@ -457,7 +457,7 @@
         set is_customer = #{isCustomer}
         where 1=1
         <if test="list != null ">
-            id in
+            and id in
             <foreach collection="list" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index f86e4b09d..83e7857e2 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -2755,7 +2755,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 		IPage<CarsLoadAllOrderVO> pageList =  baseMapper.findWaybillOrderListNoIsToMall(page,loadCarsDTO);
 
-
 		return R.data(pageList);
 	}