修改计量委托

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -181,7 +181,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "1");
                 measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", "1");
                 measureCommission.put("ended", "0");
                 break;
             case 4:
@@ -195,7 +194,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", "1");
                 measureCommission.put("ended", "0");
             case 10:
             case 11:

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

@@ -785,10 +785,9 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-<!--   采购辅料查询计量委托(达兴) -->
+<!--   采购查询计量委托(达兴) -->
     <select id="purchaseDXMeasure" parameterType="map" resultType="java.util.Map">
-        select APO.PURCHASE_ORDER_NO                                                          "psOrder",
-               APO.EAS_ENTRY_ID                                                               "easPrimaryId",
+        select APO.PURCHASE_ORDER_NO  || ',' || APO.EAS_ENTRY_ID                              "orderSource",
                OO.ORDER_NUMBER                                                                "orderId",
                RC.CAPACITY_NUMBER                                                             "carNumber",
                RTC.TRUCK_CALCULATE_NUMBER                                                     "regionName",
@@ -868,7 +867,7 @@
                    )                                                                           "providerNo",
                RCON.CONSIGNEE_COMPANY_NAME                                                      "receiver",
                RCON.CONSIGNEE_CODE                                                              "receiverNo",
-               ASM.EAS_PRIMARY_ID                                                               "easPrimaryId"
+               ASO.SALE_NUMBER || ',' || ASM.EAS_PRIMARY_ID                                     "orderSource"
 
         from OMSTRUCK_ORDER OO
         left join AMS_SALE_ORDER_MATERIAL ASOM