|
@@ -6928,6 +6928,7 @@
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
|
|
|
|
+
|
|
WHERE ASO.SALE_TYPE = 50
|
|
WHERE ASO.SALE_TYPE = 50
|
|
AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
</select>
|
|
</select>
|
|
@@ -6967,7 +6968,9 @@
|
|
ORI.THEORY_WEIGHT "inventoryTheoryWeight",
|
|
ORI.THEORY_WEIGHT "inventoryTheoryWeight",
|
|
ORI.SINGLE_WEIGHT "singleWeight",
|
|
ORI.SINGLE_WEIGHT "singleWeight",
|
|
ORI.METER "meter",
|
|
ORI.METER "meter",
|
|
- ORI.INVENTORY_ID "inventoryId"
|
|
|
|
|
|
+ ORI.INVENTORY_ID "inventoryId",
|
|
|
|
+ OOR.RESULT_ID "resultId",
|
|
|
|
+ OOR.NET_WEIGHT "inboundNetWeight"
|
|
FROM AMS_SALE_ORDER ASO
|
|
FROM AMS_SALE_ORDER ASO
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
|
ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
|
|
@@ -6990,6 +6993,8 @@
|
|
ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
|
|
ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
|
|
LEFT JOIN OYE_REALTIME_INVENTORY ORI
|
|
LEFT JOIN OYE_REALTIME_INVENTORY ORI
|
|
ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
|
|
ON ORI.INVENTORY_ID = ASM.SALE_WAREHOUSE
|
|
|
|
+ LEFT JOIN OYE_OUTBOUND_RESULT OOR
|
|
|
|
+ ON OOR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
|
|
WHERE ASO.SALE_TYPE in (1, 50)
|
|
WHERE ASO.SALE_TYPE in (1, 50)
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|