From 7fd3b5c2ddf9e0b54c862d8a28cb10558b8e9727 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 27 Apr 2024 18:31:11 +0800 Subject: [PATCH] md --- .../xdadan/erp/emis/domain/EmisWaybill.java | 20 ++- .../xdadan/erp/emis/domain/vo/FeeItem.java | 6 + .../resources/mapper/EmisWaybillMapper.xml | 170 ++++++------------ 3 files changed, 76 insertions(+), 120 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 05d939d94..cea0842a2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -161,8 +161,10 @@ public class EmisWaybill extends BaseEntity private String intoWarehouseContact; /* 入仓联系人电话 */ private String intoWarehousePhone; - /* 入仓单号 */ + /* 入仓预报单号 */ private String intoWarehouseBillCode; + /* 实际进仓单关联 */ + private String warehouseInNo; /* 客户发货开始时间 */ private String customerDeliveryBeginTime; /* 客户发货截止时间 */ @@ -171,6 +173,22 @@ public class EmisWaybill extends BaseEntity private String goodsType; /* 货物描述 */ private String goodsInfo; + /* 货物图片，逗号隔开 */ + private String goodsPics; + /* 预入仓代垫运费 1-是 */ + private String blPrepareInFreight; + /* 预入仓代垫运费 */ + private BigDecimal prepareInEstFee; + /* 预入仓实际运费 */ + private BigDecimal prepareInRealFee; + /* 预入仓快递公司 */ + private String prepareInExpress; + /* 预入仓快递单号 */ + private String prepareInBillCode; + /* 预入仓自定义标识 */ + private String prepareInRemark; + /* 预入仓供应商 */ + private String prepareInSupplier; /* 总重量 */ private BigDecimal totalWeight; /* 总体积 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java index 0463507e9..298f2391c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/FeeItem.java @@ -22,4 +22,10 @@ public class FeeItem { // 收费项 private String remark; + // 计算表达式 + private String calcExp; + // 续重 + private String addWeight; + + } diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index a5a070fa1..1d3a8560e 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -68,10 +68,19 @@ + + + + + + + + + @@ -155,7 +164,7 @@ - select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill + select id, order_sn, cust_order_id, bill_code, bill_code_sub, order_status, waybill_status, order_type, order_date, user_id, customer_code, customer_name, receive_customer_code, receive_customer_name, third_customer_code, third_customer_name, open_id, receive_name, receive_company, receive_mobile, receive_tel, receive_country, receive_province, receive_city, receive_county, receive_town, receive_address, receive_postcode, receive_pcd, send_name, send_company, send_mobile, send_tel, send_country, send_province, send_city, send_county, send_town, send_address, send_postcode, send_pcd, payment_type, calc_fee_type, cust_no, trans_line_type, product_type, time_type, meter_type, customs_clear, customs_eclaration, estimate_date, pack_type, dispatch_method, pickup_method, pick_start_date, pick_finish_date, pick_fail_reason, into_warehouse_code, into_warehouse_name, into_warehouse_address, into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, goods_pics, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, total_weight, total_volume, parcel_qty, bill_weight, volume_weight, currency, settlement_weight, fee_weight, freight, bl_over_long, bl_bill, bl_bill_text, bl_over_weight, over_weight_number, fee_remaker, third_code, real_value, bl_insure, insure_value, insure_value_currency, insure_fee_currency, insure_fee, insure_remark, insure_site_code, insure_date, bl_print, print_man_code, print_site, print_date, print_count, bl_disp_fd, transfer_code, transfer_billcode, disp_fd_date, disp_fd_reason, current_site_code, next_site_code, last_site_code, register_site_code, register_date, register_man_code, take_piece_employee_code, send_site_code, send_date, dispatch_man_code, dispatch_date, dispatch_site_code, produce_bill_date, produce_bill_site_code, produce_bill_man_code, destination_code, destination_province, destination_city, destination_county, dispatch_underling_site_code, destination_center_code, market_man_code, payee, salesmen, operate_employee_code, bl_is_question, problem_cause, bl_message, bl_accept_message, bl_gen_subbill, sign_man, sign_man_code, sign_site_code, sign_date, bill_pic_send_rmk, bill_pic_dispatch_rmk, timezone_offset, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill - - - - - - + insert into emis_waybill id, @@ -397,10 +402,19 @@ into_warehouse_contact, into_warehouse_phone, into_warehouse_bill_code, + warehouse_in_no, customer_delivery_begin_time, customer_delivery_end_time, goods_type, goods_info, + goods_pics, + bl_prepare_in_freight, + prepare_in_est_fee, + prepare_in_real_fee, + prepare_in_express, + prepare_in_bill_code, + prepare_in_remark, + prepare_in_supplier, total_weight, total_volume, parcel_qty, @@ -546,10 +560,19 @@ #{intoWarehouseContact}, #{intoWarehousePhone}, #{intoWarehouseBillCode}, + #{warehouseInNo}, #{customerDeliveryBeginTime}, #{customerDeliveryEndTime}, #{goodsType}, #{goodsInfo}, + #{goodsPics}, + #{blPrepareInFreight}, + #{prepareInEstFee}, + #{prepareInRealFee}, + #{prepareInExpress}, + #{prepareInBillCode}, + #{prepareInRemark}, + #{prepareInSupplier}, #{totalWeight}, #{totalVolume}, #{parcelQty}, @@ -633,112 +656,12 @@ - - - - update emis_waybill - bill_code_sub = #{billCodeSub}, - order_type = #{orderType}, - order_date = #{orderDate}, - user_id = #{userId}, - customer_code = #{customerCode}, - customer_name = #{customerName}, - open_id = #{openId}, - receive_name = #{receiveName}, - receive_company = #{receiveCompany}, - receive_mobile = #{receiveMobile}, - receive_tel = #{receiveTel}, - receive_country = #{receiveCountry}, - receive_province = #{receiveProvince}, - receive_city = #{receiveCity}, - receive_county = #{receiveCounty}, - receive_town = #{receiveTown}, - receive_address = #{receiveAddress}, - receive_postcode = #{receivePostcode}, - receive_pcd = #{receivePcd}, - send_name = #{sendName}, - send_company = #{sendCompany}, - send_mobile = #{sendMobile}, - send_tel = #{sendTel}, - send_country = #{sendCountry}, - send_province = #{sendProvince}, - send_city = #{sendCity}, - send_county = #{sendCounty}, - send_town = #{sendTown}, - send_address = #{sendAddress}, - send_postcode = #{sendPostcode}, - send_pcd = #{sendPcd}, - payment_type = #{paymentType}, - calc_fee_type = #{calcFeeType}, - cust_no = #{custNo}, - trans_line_type = #{transLineType}, - product_type = #{productType}, - time_type = #{timeType}, - meter_type = #{meterType}, - customs_clear = #{customsClear}, - customs_eclaration = #{customsEclaration}, - estimate_date = #{estimateDate}, - pack_type = #{packType}, - dispatch_method = #{dispatchMethod}, - pickup_method = #{pickupMethod}, - pick_start_date = #{pickStartDate}, - pick_finish_date = #{pickFinishDate}, - pick_fail_reason = #{pickFailReason}, - into_warehouse_code = #{intoWarehouseCode}, - into_warehouse_name = #{intoWarehouseName}, - into_warehouse_address = #{intoWarehouseAddress}, - into_warehouse_contact = #{intoWarehouseContact}, - into_warehouse_phone = #{intoWarehousePhone}, - into_warehouse_bill_code = #{intoWarehouseBillCode}, - customer_delivery_begin_time = #{customerDeliveryBeginTime}, - customer_delivery_end_time = #{customerDeliveryEndTime}, - goods_type = #{goodsType}, - goods_info = #{goodsInfo}, - total_weight = #{totalWeight}, - total_volume = #{totalVolume}, - parcel_qty = #{parcelQty}, - bill_weight = #{billWeight}, - volume_weight = #{volumeWeight}, - currency = #{currency}, - settlement_weight = #{settlementWeight}, - fee_weight = #{feeWeight}, - freight = #{freight}, - bl_over_long = #{blOverLong}, - bl_over_weight = #{blOverWeight}, - over_weight_number = #{overWeightNumber}, - fee_remaker = #{feeRemaker}, - third_code = #{thirdCode}, - real_value = #{realValue}, - register_site_code = #{registerSiteCode}, - take_piece_employee_code = #{takePieceEmployeeCode}, - send_site_code = #{sendSiteCode}, - send_date = #{sendDate}, - dispatch_site_code = #{dispatchSiteCode}, - destination_code = #{destinationCode}, - destination_province = #{destinationProvince}, - destination_city = #{destinationCity}, - destination_county = #{destinationCounty}, - dispatch_underling_site_code = #{dispatchUnderlingSiteCode}, - destination_center_code = #{destinationCenterCode}, - market_man_code = #{marketManCode}, - payee = #{payee}, - salesmen = #{salesmen}, - operate_employee_code = #{operateEmployeeCode}, - bl_message = #{blMessage}, - bl_accept_message = #{blAcceptMessage}, - update_by = #{updateBy}, - remark = #{remark}, - update_site = #{updateSite}, - - where id = #{id} - - - - update emis_waybill - + order_sn = #{orderSn}, + cust_order_id = #{custOrderId}, + bill_code = #{billCode}, bill_code_sub = #{billCodeSub}, order_status = #{orderStatus}, waybill_status = #{waybillStatus}, @@ -798,10 +721,19 @@ into_warehouse_contact = #{intoWarehouseContact}, into_warehouse_phone = #{intoWarehousePhone}, into_warehouse_bill_code = #{intoWarehouseBillCode}, + warehouse_in_no = #{warehouseInNo}, customer_delivery_begin_time = #{customerDeliveryBeginTime}, customer_delivery_end_time = #{customerDeliveryEndTime}, goods_type = #{goodsType}, goods_info = #{goodsInfo}, + goods_pics = #{goodsPics}, + bl_prepare_in_freight = #{blPrepareInFreight}, + prepare_in_est_fee = #{prepareInEstFee}, + prepare_in_real_fee = #{prepareInRealFee}, + prepare_in_express = #{prepareInExpress}, + prepare_in_bill_code = #{prepareInBillCode}, + prepare_in_remark = #{prepareInRemark}, + prepare_in_supplier = #{prepareInSupplier}, total_weight = #{totalWeight}, total_volume = #{totalVolume}, parcel_qty = #{parcelQty},