From 0bc18e0e933bead828eac23ea2986233db4f35aa Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 20 Sep 2023 17:57:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionAddvalueController.java       | 16 +++++++++++++-
 .../DistributionSignforController.java        | 14 +++++++++++++
 .../dto/DistributionAddvalueDTO.java          |  5 +++++
 .../mapper/DistributionAddvalueMapper.java    |  8 +++++++
 .../mapper/DistributionAddvalueMapper.xml     | 18 ++++++++++++++++
 .../service/IDistributionAddvalueService.java |  9 ++++++++
 .../service/IDistributionSignforService.java  |  8 +++++++
 .../impl/DistributionAddvalueServiceImpl.java | 15 +++++++++++++
 .../DistributionDeliveryListServiceImpl.java  | 10 ++++++++-
 .../DistributionReservationServiceImpl.java   |  5 +++--
 .../impl/DistributionSignforServiceImpl.java  | 21 +++++++++++++++++++
 11 files changed, 125 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionAddvalueController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionAddvalueController.java
index 48a46921c..caa7cbafa 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionAddvalueController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionAddvalueController.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.controller;
 
+import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.logpm.distribution.service.IDistributionAddvalueService;
@@ -52,7 +53,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("addvalue/distributionAddvalue")
+@RequestMapping("/addvalue")
 @Api(value = "配送增值服务表", tags = "配送增值服务表接口")
 public class DistributionAddvalueController extends BladeController {
 
@@ -147,4 +148,17 @@ public class DistributionAddvalueController extends BladeController {
 		ExcelUtil.export(response, "配送增值服务表数据" + DateUtil.time(), "配送增值服务表数据表", list, DistributionAddvalueExcel.class);
 	}
 
+
+//	/**
+//	 * 查询
+//	 */
+//	@PostMapping("/addvalueInfoList")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入distributionAddvalue")
+//	public R addvalueInfoList(@ApiIgnore @RequestBody DistributionAppAddvalueDTO distributionAddvalue) {
+//		R r = distributionAddvalueService.editAddvalueInfo(distributionAddvalue);
+//		return r;
+//	}
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index ad8edb991..8d28b8cf5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -19,6 +19,7 @@ package com.logpm.distribution.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.DistributionSignforEntity;
@@ -233,4 +234,17 @@ public class DistributionSignforController extends BladeController {
 		ExcelUtil.export(response, "签收管理数据" + DateUtil.time(), "签收管理数据表", list, DistributionSignforExcel.class);
 	}
 
+
+	/**
+	 * 签收管理 删除
+	 */
+	@PostMapping("/addvalueInfoList")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R addvalueInfoList(@RequestBody DistributionAddvalueDTO distributionAddvalueDTO) {
+		R r = distributionSignforService.getAddvalueInfoList(distributionAddvalueDTO);
+		return r;
+	}
+
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java
index cfd7fcecb..bd7fb5f92 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionAddvalueDTO.java
@@ -31,4 +31,9 @@ import lombok.EqualsAndHashCode;
 public class DistributionAddvalueDTO extends DistributionAddvalueEntity {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 签收ID
+	 */
+	private Long signforId;
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java
index 7784277ce..5aaaab958 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.java
@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
@@ -73,6 +74,13 @@ public interface DistributionAddvalueMapper extends BaseMapper<DistributionAddva
 	 */
 	List<DistributionAddvalueVO> addvalueInfo(@Param("reservationId")Long reservationId);
 
+	/**
+	 * 查询签收列表客户的增值服务项
+	 * @param distributionAddvalueDTO
+	 * @return
+	 */
+	DistributionAddvalueVO getAddvalueBySignfor(@Param("par")DistributionAddvalueDTO distributionAddvalueDTO);
+
 //	/**
 //	 * 删除增值服务
 //	 * @param reservationId
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml
index 7ab373283..88c63d76c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionAddvalueMapper.xml
@@ -72,5 +72,23 @@
          GROUP BY ldad.fee,ldad.num,ldad.flool_num,ldad.distance,ldad.id
 
     </select>
+    <select id="getAddvalueBySignfor" resultType="com.logpm.distribution.vo.DistributionAddvalueVO">
+                    SELECT DISTINCT
+                lda.addvalue_id,
+                group_concat(DISTINCT ldad.fee) AS fee,
+                group_concat(DISTINCT ldad.num) AS num,
+                group_concat(DISTINCT ldad.id) AS addvalueDetailId,
+                group_concat(DISTINCT ldad.flool_num) AS floolNum,
+                group_concat(DISTINCT ldad.distance) AS distance,
+                group_concat( ldap.package_id SEPARATOR ',' ) AS packageListIds
+            FROM
+								logpm_distribution_signfor AS lds
+                INNER JOIN logpm_distribution_addvalue lda ON lds.reservation_id = lda.ref_id
+                INNER JOIN logpm_distribution_addvalue_detail ldad ON lda.id = ldad.addvalue_id
+                INNER JOIN logpm_distribution_addvalue_package ldap ON ldad.id = ldap.addvalue_detail_id
+            WHERE lds.id = 	#{par.signforId} and  lda.addvalue_id = #{par.addvalueId}
+            GROUP BY
+                lda.id
+    </select>
 
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
index 3868f1013..fa17d1529 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionAddvalueService.java
@@ -19,6 +19,7 @@ package com.logpm.distribution.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
@@ -103,4 +104,12 @@ public interface IDistributionAddvalueService extends IService<DistributionAddva
 	 * @return
 	 */
 	R addvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO);
+
+
+//	/**
+//	 * 签收列表查看对应的增值服务列表信息
+//	 * @param distributionAddvalueDTO
+//	 * @return
+//	 */
+//	List<DistributionAddvaluePackageEntity> getAddvalueBySignfor(DistributionAddvalueDTO distributionAddvalueDTO);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index 907148f06..88fc06078 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -19,6 +19,7 @@ package com.logpm.distribution.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.distribution.bean.Resp;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.dto.DistrilbutionAppsignforDTO;
@@ -143,4 +144,11 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	List<DistributionReservationStocklistVO> signforInventoryList(Long signforId);
+
+	/**
+	 * 查询签收对应的增值服务类型
+	 * @param distributionAddvalueDTO
+	 * @return
+	 */
+	R getAddvalueInfoList(DistributionAddvalueDTO distributionAddvalueDTO);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
index 45ca5d504..dd248fe70 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
@@ -21,6 +21,7 @@ import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.distribution.bean.Res;
 import com.logpm.distribution.bean.Resp;
+import com.logpm.distribution.dto.DistributionAddvalueDTO;
 import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
@@ -411,4 +412,18 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		return R.data(addvalueInfo);
 	}
 
+//	@Override
+//	public List<DistributionAddvaluePackageEntity> getAddvalueBySignfor(DistributionAddvalueDTO distributionAddvalueDTO) {
+//		DistributionAddvalueVO addvalueVO  = distributionAddvalueMapper.getAddvalueBySignfor(distributionAddvalueDTO);
+//		if (Func.isNotEmpty(addvalueVO)){
+//			String packageListIds = addvalueVO.getPackageListIds();
+//			if (Func.isNotEmpty(packageListIds)){
+//				List<Long> longs = Func.toLongList(packageListIds);
+//				List<DistributionAddvaluePackageEntity> distributionAddvaluePackageEntities = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda().in(DistributionAddvaluePackageEntity::getPackageId,longs).eq(DistributionAddvaluePackageEntity::getAddvalueDetailId,addvalueVO.getAddvalueDetailId()));
+//				addvalueVO.setPackageEntityList(distributionAddvaluePackageEntities);
+//			}
+//		}
+//		return R.data(addvalueVO);
+//	}
+
 }
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 523db457b..8c40bc968 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
@@ -1934,11 +1934,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			HashSet<String> consigneeAddress = new HashSet<>();
 			//运单客户收货单位
 			HashSet<String> consignee = new HashSet<>();
+			//运单号
+			HashSet<String> waybillNo = new HashSet<>();
 
 			clientTotal.getAndIncrement();
 			if (Func.isEmpty(oldClient.get(k))) {
 				DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
-				reservationEntity.setWaybillNo(k);
+//				reservationEntity.setWaybillNo(k);
 				reservationEntity.setReservationDate(reservationDate);
 				reservationEntity.setReservationStatus(ReservationStatusConstant.daipeisong.getValue());
 				reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
@@ -1988,6 +1990,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getConsigneeAddress())) {
 						consigneeAddress.add(s.getConsigneeAddress());
 					}
+					if (Func.isNotEmpty(s.getWaybillNumber())) {
+						waybillNo.add(s.getWaybillNumber());
+					}
 					DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 					//现在前端进行订单提交必然会携带包件信息
 					List<DistributionParcelListEntity> packageListInfo = s.getPackageListInfo();
@@ -2101,6 +2106,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (Func.isNotEmpty(s.getServiceNumber())) {
 						serviceNumber.add(s.getServiceNumber());
 					}
+					if (Func.isNotEmpty(s.getWaybillNumber())) {
+						waybillNo.add(s.getWaybillNumber());
+					}
 					//此订单包件数量统计
 					AtomicInteger orderPackageNum = new AtomicInteger();
 					if (Func.isEmpty(oldOrder.get(s.getId()))) {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index ec154d596..0db34bb5a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -1381,6 +1381,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			stockupEntity.setStockupStatus(StockupStatusConstant.weibeihuo.getValue());
 			stockupEntity.setAssignStatus(StockAssignStatusConstant.weizhipai.getValue());
 		}
+		String trainNumberMa = trainNumberMa();
 		BladeUser user = AuthUtil.getUser();
 		stockupEntity.setStockupUser(user.getUserName());
 		stockupEntity.setStockupUserId(user.getUserId());
@@ -1399,7 +1400,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		//4、维护配送表数据
 		DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity();
 //		String str = Func.random(7, RandomType.ALL) + DateUtil.today();
-		distributionDeliveryListEntity.setTrainNumber(trainNumberMa());
+		distributionDeliveryListEntity.setTrainNumber(trainNumberMa);
 		distributionDeliveryListEntity.setType(DistributionTypeConstant.shangpei.getValue());
 		distributionDeliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.daipeisong.getValue());
 		distributionDeliveryListEntity.setPrice(BigDecimal.ZERO);
@@ -1561,7 +1562,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			deliveryPackageTotal.getAndAdd(reservationEntity.getReservationNum());
 			DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
 			distributionSignforEntity.setReservationId(reservationEntity.getId());
-			distributionSignforEntity.setTrainNumber(trainNumberMa());
+			distributionSignforEntity.setTrainNumber(trainNumberMa);
 			distributionSignforEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 			distributionSignforService.save(distributionSignforEntity);
 			deliveryWarehouseName.add(reservationEntity.getWarehouseName());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 71698f3e5..2e1999daf 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -102,6 +102,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	private final DistributionReservationMapper distributionReservationMapper;
 	private final IDisStockListDetailService disStockListDetailService;
 	private final IDistributionStockListService distributionStockListService;
+	private final DistributionAddvalueMapper distributionAddvalueMapper;
+	private final IDistributionAddvalueService distributionAddvalueService;
+	private final IDistributionAddvaluePackageService distributionAddvaluePackageService;
 
 	@Override
 	public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
@@ -1384,5 +1387,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return distributionReservationStocklistVOS;
 	}
 
+	@Override
+	public R getAddvalueInfoList(DistributionAddvalueDTO distributionAddvalueDTO) {
+//		List<DistributionAddvaluePackageEntity> addvaluePackageEntities = distributionAddvalueService.getAddvalueBySignfor(distributionAddvalueDTO);
+		DistributionAddvalueVO addvalueBySignfor = distributionAddvalueMapper.getAddvalueBySignfor(distributionAddvalueDTO);
+		if (Func.isNotEmpty(addvalueBySignfor)){
+			String packageListIds = addvalueBySignfor.getPackageListIds();
+			if (Func.isNotEmpty(packageListIds)){
+				List<Long> longs = Func.toLongList(packageListIds);
+				List<DistributionAddvaluePackageEntity> distributionAddvaluePackageEntities = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
+					.in(DistributionAddvaluePackageEntity::getPackageId,longs)
+					.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId,addvalueBySignfor.getAddvalueDetailId()));
+
+				addvalueBySignfor.setPackageEntityList(distributionAddvaluePackageEntities);
+			}
+		}
+		return R.data(addvalueBySignfor);
+	}
+
 
 }

From 24d6e7f10c8a676a75e78902d23cb76b1d130c3b Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 20 Sep 2023 18:19:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=87=AA=E6=8F=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/vo/PackageStockupVO.java   |  1 +
 .../mapper/DistributionParcelListMapper.xml       | 15 ++++++---------
 .../impl/DistributionStockupServiceImpl.java      |  3 ++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
index ab5ad4865..25d9be4dd 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
@@ -28,6 +28,7 @@ public class PackageStockupVO implements Serializable {
 	private String materialName;//物料名称
 	private String trayCode;//托盘名称
 	private String allocationTitle;//货位名称
+	private String allocationTitles;//货位名称
 
 	private Long scanId;//扫码记录id
 	private Long allocationId;//货位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 ac4172d1d..211bd4408 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
@@ -138,17 +138,12 @@
     </select>
     <select id="selectOrderInfoAllocationList" resultType="com.logpm.distribution.vo.PackageStockupVO">
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode,ldpl.conditions goodsType,ldpl.material_name materialName,
-        CASE WHEN lds.id IS NULL THEN 0 ELSE 1 END AS isScan,ldpl.id parceListId,(
-        select GROUP_CONCAT( DISTINCT position_code)
-        from logpm_warehouse_updown_goods_log
-        where association_id = ldpl.id
-        ) positionCode,lwug.allocation_id allocationId
+        CASE WHEN lds.id IS NULL THEN 0 ELSE 1 END AS isScan,ldpl.id parceListId,GROUP_CONCAT(lds.allocation_title) positionCode,lds.allocation_id allocationId
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
-        LEFT JOIN logpm_warehouse_updown_goods_log lwug on lwug.association_id = ldpl.id
         <where>
-            <if test="param.allocationId != null and param.allocationId != ''"> and lwug.allocation_id = #{param.allocationId} </if>
-            <if test="param.allocation != null and param.allocation != ''"> and lwug.position_code = #{param.allocation} </if>
+            <if test="param.allocationId != null and param.allocationId != ''"> and lds.allocation_id = #{param.allocationId} </if>
+            <if test="param.allocation != null and param.allocation != ''"> and lds.allocation_title = #{param.allocation} </if>
             <if test="param.stockArticleId != null and param.stockArticleId != ''">and ldpl.stock_article_id = #{param.stockArticleId} </if>
             <if test="param.stockArticleIdList != null ">
                and ldpl.stock_article_id in
@@ -157,6 +152,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY ldpl.order_code ,ldpl.order_package_code ,ldpl.conditions  ,ldpl.material_name,lds.id,ldpl.id
     </select>
     <select id="selectOrderInfoSelfList" resultType="com.logpm.distribution.vo.PackageStockupVO">
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode,ldpl.conditions goodsType,ldpl.material_name materialName,
@@ -254,7 +250,8 @@
           and ldpl.pallet = #{pallet}
           and ldr.is_deleted = 0 -->
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode, 1 goodsType,ldrp.parce_list_id parceListId,ldpl.material_name materialName,
-        lwug.allocation_title allocationTitle,lwtg.tray_code trayCode,lwug.position_code positionCode,lwug.allocation_id allocationId,lds.id stockId,lds.stockup_id stockupId
+        lwug.allocation_title allocationTitle,lwtg.tray_code trayCode,lwug.position_code positionCode,lwug.allocation_id allocationId,lds.id stockId,lds.stockup_id stockupId,
+        lds.allocation_title allocationTitles
         from logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id =ldrp.parce_list_id and lwtg.association_type = '3'
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 76d4ccd59..320c69354 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -855,7 +855,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}else{
 			//没有下架
 			List<PackageStockupVO> packageStockupVOS = distributionParcelListService.selectOrderInfoList(stockupDTO);
-			list = packageStockupVOS.stream().filter(o -> ObjectUtils.isNull(o.getStockId())).collect(Collectors.toList());
+//			list = distributionParcelListService.selectOrderInfoList(stockupDTO);
+			list = packageStockupVOS.stream().filter(o -> ObjectUtils.isNull(o.getAllocationTitles())).collect(Collectors.toList());
 
 		}
 

From a211d4a01281065d9e95ce13649a4567f47fc982 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 20 Sep 2023 18:36:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=AC=A7=E6=B4=BE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/factory/oupai/service/IOuPaiFactoryService.java | 2 +-
 .../oupai/service/impl/OuPaiFactoryDataServiceImpl.java   | 3 ++-
 .../oupai/service/impl/OuPaiFactoryServiceImpl.java       | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
index 0cd835fdd..e7fced789 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
@@ -11,7 +11,7 @@ public interface IOuPaiFactoryService {
 	String saveOuPaiFactoryOrderDTOByCarCarNumber(String carNumber);
 
 
-	String saveOuPaiPackageStatusByCode(String orderCode,Integer event);
+	String saveOuPaiPackageStatusByCode(String orderPackageCode,Integer event);
 
 	String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event);
 
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
index f70834684..56cab1033 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
@@ -25,6 +25,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 		Integer event = ouPaiDataPushVO.getEvent();
 		String typeName = ouPaiDataPushVO.getTypeName();
 		String orderCode = ouPaiDataPushVO.getOrderCode();
+		String key = ouPaiDataPushVO.getKey();
 		String code = null;
 		if(StringUtil.isBlank(typeName)){
 			log.info("#############saveData: 事件类型为空 typeName={}",typeName);
@@ -36,7 +37,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 			//收货单完成收货
 		}else if(event == 2){
 			//包件收货
-			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(orderCode,event);
+			code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
 		}else if(event == 3){
 			// 收货单创建
 			// 获取需要处理的数据并存入数据库
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
index 53de52a46..8e0490e1a 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
@@ -83,7 +83,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 	@Override
-	public String saveOuPaiPackageStatusByCode(String orderCode, Integer event) {
+	public String saveOuPaiPackageStatusByCode(String orderPackageCode, Integer event) {
 		//
 //		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=Code eq '" + orderCode + "'&select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber\n" +
 //			"&$expand=" +
@@ -99,13 +99,13 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //		handlePackageData(url, event);
 		//orderCode现在是包件码
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("oid",orderCode);
+		queryWrapper.eq("oid",orderPackageCode);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
 		packageEntity.setPackageStatus(5);
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",orderCode);
+		jo.put("orderPackageCode",orderPackageCode);
 		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据
@@ -122,7 +122,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		log.info("############saveOuPaiPackageStatusByCode: 数据处理结束");
 
-		return orderCode;
+		return orderPackageCode;
 	}
 
 	@Override