|
|
@@ -23,10 +23,10 @@
|
|
|
WHERE t1.data_type = 0)
|
|
|
UNION ALL
|
|
|
(SELECT t1.*,
|
|
|
- t2.`code` AS subscribeCode,
|
|
|
- null AS subscribeContent,
|
|
|
- t1.create_time AS subcribeTime,
|
|
|
- null AS subcribeName,
|
|
|
+ t2.`code` AS subscribeCode,
|
|
|
+ null AS subscribeContent,
|
|
|
+ t1.create_time AS subcribeTime,
|
|
|
+ null AS subcribeName,
|
|
|
t2.id AS subcribeId,
|
|
|
null AS requiredArrivalTime,
|
|
|
null AS putWarehouseId,
|
|
|
@@ -35,7 +35,7 @@
|
|
|
t2.prod_tag AS prodTag,
|
|
|
t2.prod_remark AS prodRemark,
|
|
|
null as is_in_stock,
|
|
|
- (SELECT sum(cpb.quantity * cp.quantity)
|
|
|
+ (SELECT sum(cpb.quantity)
|
|
|
FROM contract_product_bom cpb
|
|
|
LEFT JOIN contract_product cp ON cpb.contract_product_id = cp.id
|
|
|
LEFT JOIN product_info pi ON cp.product_id = pi.id
|
yzc