From ca4b914bd575ff70b0d71953ff8bc437865b7ce4 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 6 Aug 2024 10:34:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D=202.?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8C=85=E6=9D=A1=E5=85=A5=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oldproject/mapper/OrderDetailMapper.xml   |  2 +-
 .../controller/OpenOrderController.java       | 36 +++++++++++++++++++
 .../trunkline/service/IOpenOrderService.java  |  2 ++
 .../service/impl/OpenOrderServiceImpl.java    |  9 +++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
index 849aa143e..9398d2fdb 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml
@@ -6,7 +6,7 @@
     <select id="findRukuTime" resultType="java.util.Date">
         select create_time
         from ht_scan_log
-        where unit_no = #{unitNo} and old_warehouse_id = #{oldWarehouseId}
+        where unit_no = #{unitNo} and warehouse_id = #{oldWarehouseId}
         and type in (1,4)
         order by create_time desc
         limit 1
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
index 8200d51d7..d2592dd20 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
@@ -1740,4 +1740,40 @@ public class OpenOrderController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/createOrderPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "创建订单包件", notes = "传入openOrderDTO")
+	public R createOrderPackage(@RequestBody AdvanceDTO advanceDTO) {
+		String method = "############createOrderPackage: ";
+		log.info(method + "请求参数{}", advanceDTO);
+		Long advanceId = advanceDTO.getAdvanceId();
+
+
+		try{
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"没有选择仓库 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"多仓权限无法操作，请选择仓库");
+			}
+			advanceDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+
+			if(Objects.isNull(advanceId)){
+				log.warn(method+"暂存单id不能为空 advanceId={}",advanceId);
+				return R.fail(405,"暂存单id不能为空");
+			}
+
+			return openOrderService.createOrderPackage(advanceDTO);
+		}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/service/IOpenOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java
index d6dcb0b8a..6b9e355bb 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java
@@ -89,6 +89,8 @@ public interface IOpenOrderService {
 
 	R findWaybillDes(Long departureWarehouseId, Long consigneeId);
 
+	R createOrderPackage(AdvanceDTO advanceDTO);
+
 
 //	R findWaybillInfo(String waybillNo);
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 487221bea..1a5cf4aad 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -3313,6 +3313,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.data(map);
 	}
 
+	@Override
+	public R createOrderPackage(AdvanceDTO advanceDTO) {
+		Long advanceId = advanceDTO.getAdvanceId();
+		Long warehouseId = advanceDTO.getWarehouseId();
+
+
+		return null;
+	}
+
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 //		StringBuilder stringBuilder = new StringBuilder();