|
@@ -4,19 +4,19 @@
|
|
|
|
|
|
<select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
|
|
|
SELECT t1.id,
|
|
|
- t2.create_time AS contractTime,
|
|
|
+ t2.create_time AS contractTime,
|
|
|
t1.contract_id,
|
|
|
t1.product_id,
|
|
|
- t2.`code` AS contractCode,
|
|
|
- t2.user_name AS userName,
|
|
|
- t2.create_user AS salesmanId,
|
|
|
- t2.version AS contractVersion,
|
|
|
+ t2.`code` AS contractCode,
|
|
|
+ t2.user_name AS userName,
|
|
|
+ t2.create_user AS salesmanId,
|
|
|
+ t2.version AS contractVersion,
|
|
|
t1.expend_quantity AS expendQuantity,
|
|
|
(SELECT create_time
|
|
|
FROM claim_contract
|
|
|
WHERE contract_id = t2.id
|
|
|
ORDER BY create_time DESC
|
|
|
- LIMIT 1) AS claimTime,
|
|
|
+ LIMIT 1) AS claimTime,
|
|
|
t2.contract_template_id AS contractTemplateId,
|
|
|
t1.quantity,
|
|
|
t2.company_id,
|
|
@@ -30,118 +30,108 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getEHSDPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
|
|
|
- SELECT
|
|
|
- *
|
|
|
- FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- IFNULL(t3.`status`,0) AS qualityStatus,
|
|
|
- t1.create_time AS ct,
|
|
|
- "外销合同" AS orderType,
|
|
|
- t1.id,
|
|
|
- t1.product_model AS productModel,
|
|
|
- t1.product_name AS productName,
|
|
|
- t1.contract_id,
|
|
|
- t1.product_id,
|
|
|
- t2.`code` AS `contractCode`,
|
|
|
- t2.user_name AS userName,
|
|
|
- t2.version AS contractVersion,
|
|
|
- t1.expend_quantity AS expendQuantity,
|
|
|
- t2.sell_corporation_id,
|
|
|
- t2.buy_corporation_id,
|
|
|
- ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime,
|
|
|
- t1.quantity
|
|
|
- FROM
|
|
|
+ SELECT *
|
|
|
+ FROM (SELECT IFNULL(t3.`status`, 0) AS qualityStatus,
|
|
|
+ t1.create_time AS ct,
|
|
|
+ "外销合同" AS orderType,
|
|
|
+ t1.id,
|
|
|
+ t1.product_model AS productModel,
|
|
|
+ t1.product_name AS productName,
|
|
|
+ t1.contract_id,
|
|
|
+ t1.product_id,
|
|
|
+ t2.`code` AS `contractCode`,
|
|
|
+ t2.user_name AS userName,
|
|
|
+ t2.version AS contractVersion,
|
|
|
+ t1.expend_quantity AS expendQuantity,
|
|
|
+ t2.sell_corporation_id,
|
|
|
+ t2.buy_corporation_id,
|
|
|
+ (SELECT create_time
|
|
|
+ FROM claim_contract
|
|
|
+ WHERE contract_id = t2.id
|
|
|
+ ORDER BY create_time DESC LIMIT 1) AS claimTime,
|
|
|
+ t1.quantity FROM
|
|
|
contract_product t1
|
|
|
- LEFT JOIN contract t2 ON t1.contract_id = t2.id
|
|
|
- LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
- WHERE
|
|
|
- t2.`status` >= 30
|
|
|
- AND t2.`status` < 88
|
|
|
+ LEFT JOIN contract t2
|
|
|
+ ON t1.contract_id = t2.id
|
|
|
+ LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
+ WHERE
|
|
|
+ t2.`status` >= 30
|
|
|
+ AND t2.`status`
|
|
|
+ < 88
|
|
|
UNION ALL
|
|
|
- SELECT
|
|
|
- IFNULL(t3.`status`,0) AS qualityStatus,
|
|
|
- t1.create_time AS ct,
|
|
|
- "样品单" AS orderType,
|
|
|
- t1.id,
|
|
|
- t1.product_model AS productModel,
|
|
|
- t1.product_name AS productName,
|
|
|
- t1.sample_id,
|
|
|
- t1.product_id,
|
|
|
- t2.`code` AS `contractCode`,
|
|
|
- t2.user_name AS userName,
|
|
|
- t2.versions AS contractVersion,
|
|
|
- t1.expend_quantity AS expendQuantity,
|
|
|
- t2.sell_corporation_id,
|
|
|
- t2.buy_corporation_id,
|
|
|
- ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime,
|
|
|
+ SELECT IFNULL(t3.`status`, 0) AS qualityStatus,
|
|
|
+ t1.create_time AS ct,
|
|
|
+ "样品单" AS orderType,
|
|
|
+ t1.id,
|
|
|
+ t1.product_model AS productModel,
|
|
|
+ t1.product_name AS productName,
|
|
|
+ t1.sample_id,
|
|
|
+ t1.product_id,
|
|
|
+ t2.`code` AS `contractCode`,
|
|
|
+ t2.user_name AS userName,
|
|
|
+ t2.versions AS contractVersion,
|
|
|
+ t1.expend_quantity AS expendQuantity,
|
|
|
+ t2.sell_corporation_id,
|
|
|
+ t2.buy_corporation_id,
|
|
|
+ (SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime,
|
|
|
t1.quantity
|
|
|
- FROM
|
|
|
- sample_product t1
|
|
|
- LEFT JOIN sample t2 ON t1.sample_id = t2.id
|
|
|
- LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
- WHERE
|
|
|
- t2.`status` >= 30
|
|
|
- AND t2.`status` < 88
|
|
|
- ) t1
|
|
|
- ${ew.customSqlSegment}
|
|
|
- </select>
|
|
|
-
|
|
|
- <select id="getEHSDQualityPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
|
|
|
- SELECT
|
|
|
- *
|
|
|
FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- t1.create_time AS ct,
|
|
|
- "外销合同" AS orderType,
|
|
|
- t1.id,
|
|
|
- t1.product_model AS productModel,
|
|
|
- t1.product_name AS productName,
|
|
|
- t1.contract_id,
|
|
|
- t1.product_id,
|
|
|
- t2.`code` AS `contractCode`,
|
|
|
- t2.user_name AS userName,
|
|
|
- t2.version AS contractVersion,
|
|
|
- t1.expend_quantity AS expendQuantity,
|
|
|
- t3.`status` AS qualityStatus,
|
|
|
- t3.create_time AS qualityTime,
|
|
|
- t3.user_name AS qualityUserName,
|
|
|
- t2.buy_corporation_id,
|
|
|
- t3.summary AS summary
|
|
|
- FROM
|
|
|
- contract_product t1
|
|
|
- LEFT JOIN contract t2 ON t1.contract_id = t2.id
|
|
|
- LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
- WHERE
|
|
|
- t2.`status` >= 30
|
|
|
- AND t2.`status` < 88
|
|
|
- UNION ALL
|
|
|
- SELECT
|
|
|
- t1.create_time AS ct,
|
|
|
- "样品单" AS orderType,
|
|
|
- t1.id,
|
|
|
- t1.product_model AS productModel,
|
|
|
- t1.product_name AS productName,
|
|
|
- t1.sample_id,
|
|
|
- t1.product_id,
|
|
|
- t2.`code` AS `contractCode`,
|
|
|
- t2.user_name AS userName,
|
|
|
- t2.versions AS contractVersion,
|
|
|
- t1.expend_quantity AS expendQuantity,
|
|
|
- t3.`status` AS qualityStatus,
|
|
|
- t3.create_time AS qualityTime,
|
|
|
- t3.user_name AS qualityUserName,
|
|
|
- t2.buy_corporation_id
|
|
|
- t3.summary AS summary
|
|
|
- FROM
|
|
|
sample_product t1
|
|
|
- LEFT JOIN sample t2 ON t1.sample_id = t2.id
|
|
|
+ LEFT JOIN sample t2
|
|
|
+ ON t1.sample_id = t2.id
|
|
|
LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
WHERE
|
|
|
t2.`status` >= 30
|
|
|
- AND t2.`status` < 88
|
|
|
- ) t1
|
|
|
+ AND t2.`status`
|
|
|
+ < 88
|
|
|
+ ) t1 ${ew.customSqlSegment}
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="getEHSDQualityPage" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
|
|
|
+ SELECT *
|
|
|
+ FROM (SELECT t1.create_time AS ct,
|
|
|
+ "外销合同" AS orderType,
|
|
|
+ t1.id,
|
|
|
+ t1.product_model AS productModel,
|
|
|
+ t1.product_name AS productName,
|
|
|
+ t1.contract_id,
|
|
|
+ t1.product_id,
|
|
|
+ t2.`code` AS `contractCode`,
|
|
|
+ t2.user_name AS userName,
|
|
|
+ t2.version AS contractVersion,
|
|
|
+ t1.expend_quantity AS expendQuantity,
|
|
|
+ t3.`status` AS qualityStatus,
|
|
|
+ t3.create_time AS qualityTime,
|
|
|
+ t3.user_name AS qualityUserName,
|
|
|
+ t2.buy_corporation_id,
|
|
|
+ t3.summary AS summary
|
|
|
+ FROM contract_product t1
|
|
|
+ LEFT JOIN contract t2 ON t1.contract_id = t2.id
|
|
|
+ LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
+ WHERE t2.`status` >= 30
|
|
|
+ AND t2.`status` < 88
|
|
|
+ UNION ALL
|
|
|
+ SELECT t1.create_time AS ct,
|
|
|
+ "样品单" AS orderType,
|
|
|
+ t1.id,
|
|
|
+ t1.product_model AS productModel,
|
|
|
+ t1.product_name AS productName,
|
|
|
+ t1.sample_id,
|
|
|
+ t1.product_id,
|
|
|
+ t2.`code` AS `contractCode`,
|
|
|
+ t2.user_name AS userName,
|
|
|
+ t2.versions AS contractVersion,
|
|
|
+ t1.expend_quantity AS expendQuantity,
|
|
|
+ t3.`status` AS qualityStatus,
|
|
|
+ t3.create_time AS qualityTime,
|
|
|
+ t3.user_name AS qualityUserName,
|
|
|
+ t2.buy_corporation_id
|
|
|
+ t3.summary AS summary
|
|
|
+ FROM sample_product t1
|
|
|
+ LEFT JOIN sample t2 ON t1.sample_id = t2.id
|
|
|
+ LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
|
|
|
+ WHERE t2.`status` >= 30
|
|
|
+ AND t2.`status` < 88) t1
|
|
|
${ew.customSqlSegment}
|
|
|
</select>
|
|
|
|
|
@@ -205,15 +195,16 @@
|
|
|
t2.buy_corporation_id buyCorporationId,
|
|
|
t1.quantity,
|
|
|
|
|
|
- t1.expend_quantity AS expendQuantity,
|
|
|
-
|
|
|
- t3.sampleTime,
|
|
|
-
|
|
|
- t2.update_time updateTime,
|
|
|
+ t1.expend_quantity AS expendQuantity,
|
|
|
+
|
|
|
+ t3.sampleTime,
|
|
|
+
|
|
|
+ t2.update_time updateTime,
|
|
|
|
|
|
-
|
|
|
- ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS claimTime,
|
|
|
- t2.create_user
|
|
|
+
|
|
|
+ ( SELECT create_time FROM claim_contract WHERE contract_id = t2.id ORDER BY create_time DESC LIMIT 1 ) AS
|
|
|
+ claimTime,
|
|
|
+ t2.create_user
|
|
|
FROM
|
|
|
contract_product t1
|
|
|
LEFT JOIN contract t2 ON t1.contract_id = t2.id
|
|
@@ -242,4 +233,25 @@
|
|
|
${ew.customSqlSegment}
|
|
|
</select>
|
|
|
|
|
|
+ <select id="detail" resultType="com.fjhx.sale.entity.contract.vo.ContractProductVo">
|
|
|
+ SELECT cp.*,
|
|
|
+ c.place_order_type,
|
|
|
+ c.create_time AS contractCreateTime,
|
|
|
+ c.`code` AS contractCode,
|
|
|
+ c.delivery_time AS contractDeliveryTime,
|
|
|
+ c.salesman_id,
|
|
|
+ su.nick_name AS salesmanName,
|
|
|
+ c.quality_lv AS contractQualityLv,
|
|
|
+ cu.`name` AS customerName,
|
|
|
+ pi.custom_code AS productCode,
|
|
|
+ pi.color AS productColor,
|
|
|
+ pi.material AS productMaterial
|
|
|
+ FROM contract_product cp
|
|
|
+ JOIN contract c ON cp.contract_id = c.id
|
|
|
+ LEFT JOIN customer cu ON c.buy_corporation_id = cu.id
|
|
|
+ LEFT JOIN product_info pi ON cp.product_id = pi.id
|
|
|
+ LEFT JOIN sys_user su ON c.salesman_id = su.user_id
|
|
|
+ WHERE cp.id = #{id}
|
|
|
+ </select>
|
|
|
+
|
|
|
</mapper>
|