From 7552b28e36d90ff38d18cbe5ff4194f2870cf9af Mon Sep 17 00:00:00 2001
From: yanyan <513352169@qq.com>
Date: Thu, 23 Apr 2026 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Impl/PortTransitCycleServiceImpl.java | 16 +-
.../resources/mapper/order/PODetailMapper.xml | 249 ++++++++++++------
.../resources/mapper/order/POHeaderMapper.xml | 125 ++++++---
3 files changed, 257 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java b/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java
index f86dce3..1dab85c 100644
--- a/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java
+++ b/src/main/java/com/xujie/modules/port/service/Impl/PortTransitCycleServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
*
@@ -73,14 +74,15 @@ public class PortTransitCycleServiceImpl extends ServiceImpl calculateArrivalTime(PortTransitCycleVo data) {
List list = baseMapper.getListByModel(data);
- if(!CollectionUtils.isEmpty(list)){
- for(PortTransitCycleVo item : list){
- //计算预计到港时间(货物装船日期 + 运输天数 )
-// item.setCrd(item.getObd().plusDays(item.getTransitDays()));
- }
- return list;
+ if (CollectionUtils.isEmpty(list)) {
+ return new ArrayList<>();
}
- return new ArrayList<>();
+
+// return list.stream()
+// .filter(item -> item.getObd() != null && item.getTransitDays() != null)
+// .peek(item -> item.setCrd(item.getObd().plusDays(item.getTransitDays())))
+// .collect(Collectors.toList());
+ return list;
}
}
diff --git a/src/main/resources/mapper/order/PODetailMapper.xml b/src/main/resources/mapper/order/PODetailMapper.xml
index b80e337..75dcc7c 100644
--- a/src/main/resources/mapper/order/PODetailMapper.xml
+++ b/src/main/resources/mapper/order/PODetailMapper.xml
@@ -310,92 +310,171 @@
-
- update PODetail
- set
- order_no = #{item.orderNo},
- site = #{item.site},
- item_no = #{item.itemNo},
- part_no = #{item.partNo},
- status = #{item.status},
- qty = #{item.qty},
- umid = #{item.umid},
- convert_factor = #{item.convertFactor},
- price = #{item.price},
- base_price = #{item.basePrice},
- want_receive_date = #{item.wantReceiveDate},
- tax_rate = #{item.taxRate},
- tax = #{item.tax},
- additional_cost = #{item.additionalCost},
- freight = #{item.freight},
- duty = #{item.duty},
- arrive_qty = #{item.arriveQty},
- receive_qty = #{item.receiveQty},
- qty_returned = #{item.qtyReturned},
- qty_replace = #{item.qtyReplace},
- qty_scrapt = #{item.qtyScrapt},
- invoice_qty = #{item.invoiceQty},
- approve_result = #{item.approveResult},
- need_inspect_flag = #{item.needInspectFlag},
- remark = #{item.remark},
- iqc_qty = #{item.iqcQty},
- last_update_by = #{item.lastUpdateBy},
- pr_convert_note = #{item.prConvertNote},
- inspect_type_db = #{item.inspectTypeDb},
- inspect_type = #{item.inspectType},
- inspect_qty = #{item.inspectQty},
- inspect_percent = #{item.inspectPercent},
- inspection_level_no = #{item.inspectionLevelNo},
- close_tolerance = #{item.closeTolerance},
- over_receive_tolerance = #{item.overReceiveTolerance},
- item = #{item.item},
- c_value = #{item.value},
- c_ship_qty = #{item.shipQty},
- c_sum_price = #{item.sumPrice},
- c_narrival = #{item.narrival},
- c_crd = #{item.crd},
- c_inspection = #{item.inspection},
- c_real_crd = #{item.realCrd},
- c_eta = #{item.eta},
- c_flexid = #{item.flexid},
- c_obd = #{item.obd},
- c_doc_sent = #{item.docSent},
- c_telex_release = #{item.telexRelease},
- c_advance_payment = #{item.advancePayment},
- c_advance_paid = #{item.advancePaid},
- create_time = #{item.createTime},
- c_planner = #{item.planner},
- c_edit = #{item.edit},
- c_end_planner = #{item.endPlanner},
- c_remark_delay = #{item.remarkDelay},
- qty_cancelled = #{item.qtyCancelled},
- inspect_method_db = #{item.inspectMethodDb},
- to_inv_nofity_qty = #{item.toInvNofityQty},
- upload_date = #{item.uploadDate},
- order_ref1 = #{item.orderRef1},
- order_ref5 = #{item.orderRef5},
- batch_no = #{item.batchNo},
- order_ref4 = #{item.orderRef4},
- pre_pay_amount = #{item.prePayAmount},
- upload_by = #{item.uploadBy},
- pur_lead_time = #{item.purLeadTime},
- order_ref_type = #{item.orderRefType},
- order_ref3 = #{item.orderRef3},
- need_receive_flag = #{item.needReceiveFlag},
- upload_flag = #{item.uploadFlag},
- pre_pay_reverse_amount = #{item.prePayReverseAmount},
- out_work_order_flag = #{item.outWorkOrderFlag},
- order_ref2 = #{item.orderRef2},
- qty_rbjs = #{item.qtyRbjs},
- pre_pay_pay_amount = #{item.prePayPayAmount},
- need_date = #{item.needDate},
- inspect_method = #{item.inspectMethod},
- inv_notify_qty = #{item.invNotifyQty}
-
- where id = #{item.id}
-
+ UPDATE pd
+ SET
+ order_no = t.order_no,
+ site = t.site,
+ item_no = t.item_no,
+ part_no = t.part_no,
+ status = t.status,
+ qty = t.qty,
+ umid = t.umid,
+ convert_factor = t.convert_factor,
+ price = t.price,
+ base_price = t.base_price,
+ want_receive_date = t.want_receive_date,
+ tax_rate = t.tax_rate,
+ tax = t.tax,
+ additional_cost = t.additional_cost,
+ freight = t.freight,
+ duty = t.duty,
+ arrive_qty = t.arrive_qty,
+ receive_qty = t.receive_qty,
+ qty_returned = t.qty_returned,
+ qty_replace = t.qty_replace,
+ qty_scrapt = t.qty_scrapt,
+ invoice_qty = t.invoice_qty,
+ approve_result = t.approve_result,
+ need_inspect_flag = t.need_inspect_flag,
+ remark = t.remark,
+ iqc_qty = t.iqc_qty,
+ last_update_by = t.last_update_by,
+ pr_convert_note = t.pr_convert_note,
+ inspect_type_db = t.inspect_type_db,
+ inspect_type = t.inspect_type,
+ inspect_qty = t.inspect_qty,
+ inspect_percent = t.inspect_percent,
+ inspection_level_no = t.inspection_level_no,
+ close_tolerance = t.close_tolerance,
+ over_receive_tolerance = t.over_receive_tolerance,
+ item = t.item,
+ c_value = t.c_value,
+ c_ship_qty = t.c_ship_qty,
+ c_sum_price = t.c_sum_price,
+ c_narrival = t.c_narrival,
+ c_crd = t.c_crd,
+ c_inspection = t.c_inspection,
+ c_real_crd = t.c_real_crd,
+ c_eta = t.c_eta,
+ c_flexid = t.c_flexid,
+ c_obd = t.c_obd,
+ c_doc_sent = t.c_doc_sent,
+ c_telex_release = t.c_telex_release,
+ c_advance_payment = t.c_advance_payment,
+ c_advance_paid = t.c_advance_paid,
+ create_time = t.create_time,
+ c_planner = t.c_planner,
+ c_edit = t.c_edit,
+ c_end_planner = t.c_end_planner,
+ c_remark_delay = t.c_remark_delay,
+ qty_cancelled = t.qty_cancelled,
+ inspect_method_db = t.inspect_method_db,
+ to_inv_nofity_qty = t.to_inv_nofity_qty,
+ upload_date = t.upload_date,
+ order_ref1 = t.order_ref1,
+ order_ref5 = t.order_ref5,
+ batch_no = t.batch_no,
+ order_ref4 = t.order_ref4,
+ pre_pay_amount = t.pre_pay_amount,
+ upload_by = t.upload_by,
+ pur_lead_time = t.pur_lead_time,
+ order_ref_type = t.order_ref_type,
+ order_ref3 = t.order_ref3,
+ need_receive_flag = t.need_receive_flag,
+ upload_flag = t.upload_flag,
+ pre_pay_reverse_amount = t.pre_pay_reverse_amount,
+ out_work_order_flag = t.out_work_order_flag,
+ order_ref2 = t.order_ref2,
+ qty_rbjs = t.qty_rbjs,
+ pre_pay_pay_amount = t.pre_pay_pay_amount,
+ need_date = t.need_date,
+ inspect_method = t.inspect_method,
+ inv_notify_qty = t.inv_notify_qty
+ FROM PODetail pd
+ INNER JOIN (
+
+ SELECT
+ #{item.id} AS id,
+ #{item.orderNo} AS order_no,
+ #{item.site} AS site,
+ #{item.itemNo} AS item_no,
+ #{item.partNo} AS part_no,
+ #{item.status} AS status,
+ #{item.qty} AS qty,
+ #{item.umid} AS umid,
+ #{item.convertFactor} AS convert_factor,
+ #{item.price} AS price,
+ #{item.basePrice} AS base_price,
+ #{item.wantReceiveDate} AS want_receive_date,
+ #{item.taxRate} AS tax_rate,
+ #{item.tax} AS tax,
+ #{item.additionalCost} AS additional_cost,
+ #{item.freight} AS freight,
+ #{item.duty} AS duty,
+ #{item.arriveQty} AS arrive_qty,
+ #{item.receiveQty} AS receive_qty,
+ #{item.qtyReturned} AS qty_returned,
+ #{item.qtyReplace} AS qty_replace,
+ #{item.qtyScrapt} AS qty_scrapt,
+ #{item.invoiceQty} AS invoice_qty,
+ #{item.approveResult} AS approve_result,
+ #{item.needInspectFlag} AS need_inspect_flag,
+ #{item.remark} AS remark,
+ #{item.iqcQty} AS iqc_qty,
+ #{item.lastUpdateBy} AS last_update_by,
+ #{item.prConvertNote} AS pr_convert_note,
+ #{item.inspectTypeDb} AS inspect_type_db,
+ #{item.inspectType} AS inspect_type,
+ #{item.inspectQty} AS inspect_qty,
+ #{item.inspectPercent} AS inspect_percent,
+ #{item.inspectionLevelNo} AS inspection_level_no,
+ #{item.closeTolerance} AS close_tolerance,
+ #{item.overReceiveTolerance} AS over_receive_tolerance,
+ #{item.item} AS item,
+ #{item.value} AS c_value,
+ #{item.shipQty} AS c_ship_qty,
+ #{item.sumPrice} AS c_sum_price,
+ #{item.narrival} AS c_narrival,
+ #{item.crd} AS c_crd,
+ #{item.inspection} AS c_inspection,
+ #{item.realCrd} AS c_real_crd,
+ #{item.eta} AS c_eta,
+ #{item.flexid} AS c_flexid,
+ #{item.obd} AS c_obd,
+ #{item.docSent} AS c_doc_sent,
+ #{item.telexRelease} AS c_telex_release,
+ #{item.advancePayment} AS c_advance_payment,
+ #{item.advancePaid} AS c_advance_paid,
+ #{item.createTime} AS create_time,
+ #{item.planner} AS c_planner,
+ #{item.edit} AS c_edit,
+ #{item.endPlanner} AS c_end_planner,
+ #{item.remarkDelay} AS c_remark_delay,
+ #{item.qtyCancelled} AS qty_cancelled,
+ #{item.inspectMethodDb} AS inspect_method_db,
+ #{item.toInvNofityQty} AS to_inv_nofity_qty,
+ #{item.uploadDate} AS upload_date,
+ #{item.orderRef1} AS order_ref1,
+ #{item.orderRef5} AS order_ref5,
+ #{item.batchNo} AS batch_no,
+ #{item.orderRef4} AS order_ref4,
+ #{item.prePayAmount} AS pre_pay_amount,
+ #{item.uploadBy} AS upload_by,
+ #{item.purLeadTime} AS pur_lead_time,
+ #{item.orderRefType} AS order_ref_type,
+ #{item.orderRef3} AS order_ref3,
+ #{item.needReceiveFlag} AS need_receive_flag,
+ #{item.uploadFlag} AS upload_flag,
+ #{item.prePayReverseAmount} AS pre_pay_reverse_amount,
+ #{item.outWorkOrderFlag} AS out_work_order_flag,
+ #{item.orderRef2} AS order_ref2,
+ #{item.qtyRbjs} AS qty_rbjs,
+ #{item.prePayPayAmount} AS pre_pay_pay_amount,
+ #{item.needDate} AS need_date,
+ #{item.inspectMethod} AS inspect_method,
+ #{item.invNotifyQty} AS inv_notify_qty
-
+ ) t ON pd.id = t.id
diff --git a/src/main/resources/mapper/order/POHeaderMapper.xml b/src/main/resources/mapper/order/POHeaderMapper.xml
index af7247b..c8611fb 100644
--- a/src/main/resources/mapper/order/POHeaderMapper.xml
+++ b/src/main/resources/mapper/order/POHeaderMapper.xml
@@ -156,48 +156,91 @@