修改

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -3030,7 +3030,11 @@
             WHEN ASM.IS_POUND_SALE = 1
             THEN ASM.MATERIAL_WEIGHT
             END) "materialAcWeight",
-        ASM.EAS_PRIMARY_ID "closeEntryId",
+        CASE WHEN
+        ASM.EAS_PRIMARY_ID IS NULL
+        THEN ASM.SALE_MATERIAL_ID
+        ELSE ASM.EAS_PRIMARY_ID
+        END      "closeEntryId",
         ASM.DELETED "deletedStatus",
         (CASE
         WHEN RC2.CONSIGNEE_COMPANY_NAME IS NOT NULL
@@ -3445,7 +3449,11 @@
         WHEN ASM.IS_POUND_SALE = 1
         THEN ASM.MATERIAL_WEIGHT
         END) "materialAcWeight",
-        ASM.EAS_PRIMARY_ID "closeEntryId",
+        CASE WHEN
+        ASM.EAS_PRIMARY_ID IS NULL
+        THEN ASM.SALE_MATERIAL_ID
+        ELSE ASM.EAS_PRIMARY_ID
+        END  "closeEntryId",
         ASM.DELETED "deletedStatus",
         (CASE
         WHEN RC2.CONSIGNEE_COMPANY_NAME IS NOT NULL