md
This commit is contained in:
linfso
parent
4a5308462e
commit
f1634c1d5f
@ -75,6 +75,20 @@ public class EmisTmsScanRecordController extends BaseController
|
||||
private IEmisTmsTransPlanDtlService emisTmsTransPlanDtlService;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 签收签收统计数据
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:signStat')")
|
||||
@GetMapping("/querySignStatData")
|
||||
public TableDataInfo querySignStatData(EmisTmsScanRecord emisTmsScanRecord)
|
||||
{
|
||||
startPage();
|
||||
List<Map> list = emisTmsScanRecordService.querySignStatData(emisTmsScanRecord);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取可扫描的运单
|
||||
* @param scanInfo
|
||||
|
||||
@ -93,4 +93,14 @@ public interface IEmisTmsScanRecordService
|
||||
*/
|
||||
public List<Map> queryWaybillTraceInfo(String billCode, String lang);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 签收异常对比
|
||||
* @param emisTmsScanRecord
|
||||
* @return
|
||||
*/
|
||||
public List<Map> querySignStatData(EmisTmsScanRecord emisTmsScanRecord);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -673,6 +673,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<Map> getTraceListByBillCode(String billCode) {
|
||||
return emisTmsScanRecordMapper.selectTraceListByBillCode(billCode);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
<association property="waybillDetail"
|
||||
column="bill_code"
|
||||
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectEmisWaybillByBillCode"
|
||||
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
|
||||
fetchType="lazy"
|
||||
/>
|
||||
|
||||
|
||||
@ -4,6 +4,215 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
|
||||
|
||||
<resultMap type="EmisWaybill" id="BaseEmisWaybillResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="orderSn" column="order_sn" />
|
||||
<result property="custOrderId" column="cust_order_id" />
|
||||
<result property="billCode" column="bill_code" />
|
||||
<result property="billCodeSub" column="bill_code_sub" />
|
||||
<result property="orderStatus" column="order_status" />
|
||||
<result property="waybillStatus" column="waybill_status" />
|
||||
<result property="orderType" column="order_type" />
|
||||
<result property="orderDate" column="order_date" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="customerCode" column="customer_code" />
|
||||
<result property="customerName" column="customer_name" />
|
||||
<result property="openId" column="open_id" />
|
||||
<result property="receiveName" column="receive_name" />
|
||||
<result property="receiveCompany" column="receive_company" />
|
||||
<result property="receiveMobile" column="receive_mobile" />
|
||||
<result property="receiveTel" column="receive_tel" />
|
||||
<result property="receiveCountry" column="receive_country" />
|
||||
<result property="receiveProvince" column="receive_province" />
|
||||
<result property="receiveCity" column="receive_city" />
|
||||
<result property="receiveCounty" column="receive_county" />
|
||||
<result property="receiveTown" column="receive_town" />
|
||||
<result property="receiveAddress" column="receive_address" />
|
||||
<result property="receivePostcode" column="receive_postcode" />
|
||||
<result property="receivePcd" column="receive_pcd" />
|
||||
<result property="sendName" column="send_name" />
|
||||
<result property="sendCompany" column="send_company" />
|
||||
<result property="sendMobile" column="send_mobile" />
|
||||
<result property="sendTel" column="send_tel" />
|
||||
<result property="sendCountry" column="send_country" />
|
||||
<result property="sendProvince" column="send_province" />
|
||||
<result property="sendCity" column="send_city" />
|
||||
<result property="sendCounty" column="send_county" />
|
||||
<result property="sendTown" column="send_town" />
|
||||
<result property="sendAddress" column="send_address" />
|
||||
<result property="sendPostcode" column="send_postcode" />
|
||||
<result property="sendPcd" column="send_pcd" />
|
||||
<result property="paymentType" column="payment_type" />
|
||||
<result property="calcFeeType" column="calc_fee_type" />
|
||||
<result property="custNo" column="cust_no" />
|
||||
<result property="custName" column="cust_name" />
|
||||
<result property="transLineType" column="trans_line_type" />
|
||||
<result property="productType" column="product_type" />
|
||||
<result property="timeType" column="time_type" />
|
||||
<result property="meterType" column="meter_type" />
|
||||
<result property="carryType" column="carry_type" />
|
||||
<result property="customsClear" column="customs_clear" />
|
||||
<result property="customsEclaration" column="customs_eclaration" />
|
||||
<result property="estimateDate" column="estimate_date" />
|
||||
<result property="packType" column="pack_type" />
|
||||
<result property="dispatchMethod" column="dispatch_method" />
|
||||
<result property="pickupMethod" column="pickup_method" />
|
||||
<result property="pickStartDate" column="pick_start_date" />
|
||||
<result property="pickFinishDate" column="pick_finish_date" />
|
||||
<result property="pickFailReason" column="pick_fail_reason" />
|
||||
<result property="intoWarehouseCode" column="into_warehouse_code" />
|
||||
<result property="intoWarehouseName" column="into_warehouse_name" />
|
||||
<result property="intoWarehouseAddress" column="into_warehouse_address" />
|
||||
<result property="intoWarehouseContact" column="into_warehouse_contact" />
|
||||
<result property="intoWarehousePhone" column="into_warehouse_phone" />
|
||||
<result property="intoWarehouseBillCode" column="into_warehouse_bill_code" />
|
||||
<result property="warehouseInNo" column="warehouse_in_no" />
|
||||
<result property="customerDeliveryBeginTime" column="customer_delivery_begin_time" />
|
||||
<result property="customerDeliveryEndTime" column="customer_delivery_end_time" />
|
||||
<result property="goodsType" column="goods_type" />
|
||||
<result property="goodsInfo" column="goods_info" />
|
||||
<result property="goodsPics" column="goods_pics" />
|
||||
<result property="blPrepareInFreight" column="bl_prepare_in_freight" />
|
||||
<result property="prepareInEstFee" column="prepare_in_est_fee" />
|
||||
<result property="prepareInRealFee" column="prepare_in_real_fee" />
|
||||
<result property="prepareInExpress" column="prepare_in_express" />
|
||||
<result property="prepareInBillCode" column="prepare_in_bill_code" />
|
||||
<result property="prepareInRemark" column="prepare_in_remark" />
|
||||
<result property="prepareInSupplier" column="prepare_in_supplier" />
|
||||
<result property="totalWeight" column="total_weight" />
|
||||
<result property="totalVolume" column="total_volume" />
|
||||
<result property="parcelQty" column="parcel_qty" />
|
||||
<result property="billWeight" column="bill_weight" />
|
||||
<result property="volumeWeight" column="volume_weight" />
|
||||
<result property="currency" column="currency" />
|
||||
<result property="settlementWeight" column="settlement_weight" />
|
||||
<result property="scanWeight" column="scan_weight" />
|
||||
<result property="feeWeight" column="fee_weight" />
|
||||
<result property="freight" column="freight" />
|
||||
<result property="realPaymentType" column="real_payment_type" />
|
||||
<result property="realFee" column="real_fee" />
|
||||
<result property="blSpecialQuote" column="bl_special_quote" />
|
||||
<result property="blOverLong" column="bl_over_long" />
|
||||
<result property="blBill" column="bl_bill" />
|
||||
<result property="blBillText" column="bl_bill_text" />
|
||||
<result property="blOverWeight" column="bl_over_weight" />
|
||||
<result property="overWeightNumber" column="over_weight_number" />
|
||||
<result property="feeRemaker" column="fee_remaker" />
|
||||
<result property="thirdCode" column="third_code" />
|
||||
<result property="realValue" column="real_value" />
|
||||
<result property="blInsure" column="bl_insure" />
|
||||
<result property="insureValue" column="insure_value" />
|
||||
<result property="insureValueCurrency" column="insure_value_currency" />
|
||||
<result property="insureFeeCurrency" column="insure_fee_currency" />
|
||||
<result property="insureFee" column="insure_fee" />
|
||||
<result property="insureRemark" column="insure_remark" />
|
||||
<result property="insureSiteCode" column="insure_site_code" />
|
||||
<result property="insureDate" column="insure_date" />
|
||||
<result property="blPrint" column="bl_print" />
|
||||
<result property="printManCode" column="print_man_code" />
|
||||
<result property="printSite" column="print_site" />
|
||||
<result property="printDate" column="print_date" />
|
||||
<result property="printCount" column="print_count" />
|
||||
<result property="blDispFd" column="bl_disp_fd" />
|
||||
<result property="transferCode" column="transfer_code" />
|
||||
<result property="transferBillcode" column="transfer_billcode" />
|
||||
<result property="dispFdDate" column="disp_fd_date" />
|
||||
<result property="dispFdReason" column="disp_fd_reason" />
|
||||
<result property="currentSiteCode" column="current_site_code" />
|
||||
<result property="nextSiteCode" column="next_site_code" />
|
||||
<result property="lastSiteCode" column="last_site_code" />
|
||||
<result property="registerSiteCode" column="register_site_code" />
|
||||
<result property="registerDate" column="register_date" />
|
||||
<result property="registerManCode" column="register_man_code" />
|
||||
<result property="takePieceEmployeeCode" column="take_piece_employee_code" />
|
||||
<result property="sendSiteCode" column="send_site_code" />
|
||||
<result property="sendDate" column="send_date" />
|
||||
<result property="dispatchManCode" column="dispatch_man_code" />
|
||||
<result property="dispatchDate" column="dispatch_date" />
|
||||
<result property="dispatchSiteCode" column="dispatch_site_code" />
|
||||
<result property="produceBillDate" column="produce_bill_date" />
|
||||
<result property="produceBillSiteCode" column="produce_bill_site_code" />
|
||||
<result property="produceBillManCode" column="produce_bill_man_code" />
|
||||
<result property="destinationCode" column="destination_code" />
|
||||
<result property="destinationProvince" column="destination_province" />
|
||||
<result property="destinationCity" column="destination_city" />
|
||||
<result property="destinationCounty" column="destination_county" />
|
||||
<result property="dispatchUnderlingSiteCode" column="dispatch_underling_site_code" />
|
||||
<result property="destinationCenterCode" column="destination_center_code" />
|
||||
<result property="marketManCode" column="market_man_code" />
|
||||
<result property="payee" column="payee" />
|
||||
<result property="salesmen" column="salesmen" />
|
||||
<result property="operateEmployeeCode" column="operate_employee_code" />
|
||||
<result property="blIsQuestion" column="bl_is_question" />
|
||||
<result property="problemType" column="problem_type" />
|
||||
<result property="problemCause" column="problem_cause" />
|
||||
<result property="problemDelayDays" column="problem_delay_days" />
|
||||
<result property="blMessage" column="bl_message" />
|
||||
<result property="blAcceptMessage" column="bl_accept_message" />
|
||||
<result property="blGenSubbill" column="bl_gen_subbill" />
|
||||
<result property="signMan" column="sign_man" />
|
||||
<result property="signManCode" column="sign_man_code" />
|
||||
<result property="signSiteCode" column="sign_site_code" />
|
||||
<result property="signDate" column="sign_date" />
|
||||
<result property="billPicSendRmk" column="bill_pic_send_rmk" />
|
||||
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
|
||||
<result property="timezoneOffset" column="timezone_offset" />
|
||||
<result property="paymentStatus" column="payment_status" />
|
||||
<result property="paymentDate" column="payment_date" />
|
||||
<result property="paymentRemark" column="payment_remark" />
|
||||
<result property="orderRemark" column="order_remark" />
|
||||
<result property="dataFrom" column="data_from" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="createSite" column="create_site" />
|
||||
<result property="updateSite" column="update_site" />
|
||||
|
||||
<association property="receiveCountryName" column="receive_country" select="selectCountryNameByCode"/>
|
||||
<association property="receiveProvinceName" column="receive_province" select="selectRegionNameByCode"/>
|
||||
<association property="receiveCityName" column="receive_city" select="selectRegionNameByCode"/>
|
||||
<association property="receiveCountyName" column="receive_county" select="selectRegionNameByCode"/>
|
||||
|
||||
<association property="sendCountryName" column="send_country" select="selectCountryNameByCode"/>
|
||||
<association property="sendProvinceName" column="send_province" select="selectRegionNameByCode"/>
|
||||
<association property="sendCityName" column="send_city" select="selectRegionNameByCode"/>
|
||||
<association property="sendCountyName" column="send_county" select="selectRegionNameByCode"/>
|
||||
|
||||
<association property="productTypeName" column="product_type" select="selectProdNameByCode"/>
|
||||
<association property="transLineTypeName" column="trans_line_type" select="selectLineNameByCode"/>
|
||||
|
||||
<association property="sendSiteName" column="send_site_code" select="selectSiteNameByCode"/>
|
||||
|
||||
<association property="dispatchUnderlingSiteName" column="dispatch_underling_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="destinationName" column="destination_code" select="selectDestNameByCode"/>
|
||||
|
||||
<association property="dispatchSiteName" column="dispatch_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="dispatchManName" column="dispatch_man_code" select="selectEmpNameByCode"/>
|
||||
|
||||
<association property="printSiteName" column="print_site" select="selectSiteNameByCode"/>
|
||||
<association property="printManName" column="print_man_code" select="selectEmpNameByCode"/>
|
||||
|
||||
|
||||
<association property="takePieceEmployeeName" column="take_piece_employee_code" select="selectEmpNameByCode"/>
|
||||
<association property="operateEmployeeName" column="operate_employee_code" select="selectEmpNameByCode"/>
|
||||
|
||||
<association property="registerSiteName" column="register_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="registerManName" column="register_man_code" select="selectEmpNameByCode"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="EmisWaybillResult" extends="com.xdadan.erp.emis.mapper.EmisWaybillMapper.BaseEmisWaybillResult" type="com.example.Member">
|
||||
|
||||
<association property="lastScanRecord" column="bill_code" select="selectLastRecordByBillCode"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
|
||||
|
||||
<resultMap type="EmisWaybill" id="EmisWaybillResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="orderSn" column="order_sn" />
|
||||
@ -331,6 +540,15 @@
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<!-- 提供给扫描记录 查询使用-->
|
||||
<select id="selectWaybillBaseInfoByBillCode" parameterType="String" resultMap="BaseEmisWaybillResult">
|
||||
<include refid="selectEmisWaybillVo"/>
|
||||
<where>
|
||||
bill_code = #{billCode}
|
||||
</where>
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectEmisWaybillByOrderSn" parameterType="String" resultMap="EmisWaybillResult">
|
||||
<include refid="selectEmisWaybillVo"/>
|
||||
<where>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user