|
@@ -3,7 +3,7 @@
|
|
|
<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.PurchaseClosingReportMapper">
|
|
|
|
|
|
|
|
|
- <!-- 获得采购入库统计总数 -->
|
|
|
+ <!-- 获得采购平仓统计总数 -->
|
|
|
<select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
|
|
|
SELECT
|
|
|
COUNT(id)
|
|
@@ -45,42 +45,29 @@
|
|
|
</select>
|
|
|
<!-- 获得采购平仓统计列表 -->
|
|
|
<select id="getListByCondition" parameterType="Map"
|
|
|
- resultType="com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport">
|
|
|
+ resultType="com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport">
|
|
|
SELECT
|
|
|
id,
|
|
|
comp_id as compId,
|
|
|
contract_no as contractNo,
|
|
|
- goods_name as goodsName,
|
|
|
- position_number as positionnumber,
|
|
|
- tran_car_no as tranCarNo,
|
|
|
- car_no as carNo,
|
|
|
- warehousing_date as warehousingDate,
|
|
|
- water_content as waterContent,
|
|
|
- protein,
|
|
|
- settlement_price as settlementPrice,
|
|
|
- net_weight as netWeight,
|
|
|
- carry_over_weight as carryOverWeight,
|
|
|
- deduction_amount AS deductionAmount,
|
|
|
- deduction_items AS deductionItems,
|
|
|
+ close_position_date as closePositionDate,
|
|
|
+ closing_quantity as closingQuantity,
|
|
|
+ transaction_price as transactionPrice,
|
|
|
+ close_rate as closeRate,
|
|
|
+ basis_price as basisPrice,
|
|
|
amount_ing_payable as amountIngPayable,
|
|
|
amount_ed_payable as amountEdPayable,
|
|
|
amount_not_payable as amountNotPayable,
|
|
|
- payment_screenshot as paymentScreenshot,
|
|
|
payment_date as paymentDate,
|
|
|
- already_invoice as alreadyInvoice,
|
|
|
+ collection_ing_payable as collectionIngPayable,
|
|
|
+ collection_ed_payable as collectionEdPayable,
|
|
|
+ collection_not_payable as collectionNotPayable,
|
|
|
+ collection_date as collectionDate,
|
|
|
customer_name as customerName,
|
|
|
- invoice_type as invoiceType,
|
|
|
- warehouse_name as warehouseName,
|
|
|
- unit_price as unitPrice,
|
|
|
- basis_price as basisPrice,
|
|
|
- unloading_charge as unloading_charge,
|
|
|
- invoice_fee as invoiceFee,
|
|
|
- replen,
|
|
|
- carry_forward as carryForward,
|
|
|
+ warehouse_name as warehouseName,
|
|
|
status,
|
|
|
status_flag as statusFlag,
|
|
|
- approve_status approveStatus,
|
|
|
- customer_confirmation_status_flag as customerConfirmationStatusFlag,
|
|
|
+ approve_status as approveStatus,
|
|
|
workflow_id as workflowId
|
|
|
FROM purchase_closing_report
|
|
|
WHERE
|