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 @@ - - UPDATE POHeader - SET supplier_no = #{item.supplierNo}, - order_date = #{item.orderDate}, - enter_date = #{item.enterDate}, - want_receive_date = #{item.wantReceiveDate}, - user_name = #{item.userName}, - buyer = #{item.buyer}, - status = #{item.status}, - source_flag = #{item.sourceFlag}, - order_type = #{item.orderType}, - remark = #{item.remark}, - payment_term = #{item.paymentTerm}, - delivery_term = #{item.deliveryTerm}, - currency = #{item.currency}, - currency_rate = #{item.currencyRate}, - authorize_flag = #{item.authorizeFlag}, - approved_flag = #{item.approvedFlag}, - approve_result = #{item.approveResult}, - authorizator = #{item.authorizator}, - authorize_date = #{item.authorizeDate}, - tax_code = #{item.taxCode}, - auth_rule_id = #{item.authRuleId}, - pack_method = #{item.packMethod}, - ship_via = #{item.shipVia}, - other_condition = #{item.otherCondition}, - internal_order_flag = #{item.internalOrderFlag}, - c_customer = #{item.customer}, - po_no = #{item.poNo}, - c_departure = #{item.departure}, - c_destination = #{item.destination}, - c_enquiry = #{item.enquiry}, - c_confirmed = #{item.confirmed}, - confirmed_by = #{item.confirmedBy}, - confirmed_remark = #{item.confirmedRemark}, - first_step_approved_flag = #{item.firstStepApprovedFlag}, - printed = #{item.printed}, - confirmed_date = #{item.confirmedDate}, - confirmed_flag = #{item.confirmedFlag}, - confirmed_result = #{item.confirmedResult} - WHERE id = #{item.id} + UPDATE ph + SET + supplier_no = t.supplier_no, + order_date = t.order_date, + enter_date = t.enter_date, + want_receive_date = t.want_receive_date, + user_name = t.user_name, + buyer = t.buyer, + status = t.status, + source_flag = t.source_flag, + order_type = t.order_type, + remark = t.remark, + payment_term = t.payment_term, + delivery_term = t.delivery_term, + currency = t.currency, + currency_rate = t.currency_rate, + authorize_flag = t.authorize_flag, + approved_flag = t.approved_flag, + approve_result = t.approve_result, + authorizator = t.authorizator, + authorize_date = t.authorize_date, + tax_code = t.tax_code, + auth_rule_id = t.auth_rule_id, + pack_method = t.pack_method, + ship_via = t.ship_via, + other_condition = t.other_condition, + internal_order_flag = t.internal_order_flag, + c_customer = t.c_customer, + po_no = t.po_no, + c_departure = t.c_departure, + c_destination = t.c_destination, + c_enquiry = t.c_enquiry, + c_confirmed = t.c_confirmed, + confirmed_by = t.confirmed_by, + confirmed_remark = t.confirmed_remark, + first_step_approved_flag = t.first_step_approved_flag, + printed = t.printed, + confirmed_date = t.confirmed_date, + confirmed_flag = t.confirmed_flag, + confirmed_result = t.confirmed_result + FROM POHeader ph + INNER JOIN ( + + SELECT + #{item.id} AS id, + #{item.supplierNo} AS supplier_no, + #{item.orderDate} AS order_date, + #{item.enterDate} AS enter_date, + #{item.wantReceiveDate} AS want_receive_date, + #{item.userName} AS user_name, + #{item.buyer} AS buyer, + #{item.status} AS status, + #{item.sourceFlag} AS source_flag, + #{item.orderType} AS order_type, + #{item.remark} AS remark, + #{item.paymentTerm} AS payment_term, + #{item.deliveryTerm} AS delivery_term, + #{item.currency} AS currency, + #{item.currencyRate} AS currency_rate, + #{item.authorizeFlag} AS authorize_flag, + #{item.approvedFlag} AS approved_flag, + #{item.approveResult} AS approve_result, + #{item.authorizator} AS authorizator, + #{item.authorizeDate} AS authorize_date, + #{item.taxCode} AS tax_code, + #{item.authRuleId} AS auth_rule_id, + #{item.packMethod} AS pack_method, + #{item.shipVia} AS ship_via, + #{item.otherCondition} AS other_condition, + #{item.internalOrderFlag} AS internal_order_flag, + #{item.customer} AS c_customer, + #{item.poNo} AS po_no, + #{item.departure} AS c_departure, + #{item.destination} AS c_destination, + #{item.enquiry} AS c_enquiry, + #{item.confirmed} AS c_confirmed, + #{item.confirmedBy} AS confirmed_by, + #{item.confirmedRemark} AS confirmed_remark, + #{item.firstStepApprovedFlag} AS first_step_approved_flag, + #{item.printed} AS printed, + #{item.confirmedDate} AS confirmed_date, + #{item.confirmedFlag} AS confirmed_flag, + #{item.confirmedResult} AS confirmed_result + ) t ON ph.id = t.id