Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

pom.xml

@@ -112,7 +112,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
+                        <param>OMSTRAIN_ORDER</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -4477,8 +4477,8 @@
                         RAS.ARRIVAL_ID                                          "toTheStationId",
                         ASM.IS_POUND_SALE                                       "isPoundSale",
                         ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
-                        TPAR.RESULT_ID                                          "approveId",
-                        ASM.IS_POUND_SALE                                       "isPoundSale"
+                        TPAR.RESULT_ID                                          "approveId"
+
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID