rtj

src/main/java/com/steerinfo/dil/controller/OmstruckOrderMaterialController.java

@@ -67,7 +67,12 @@ public class OmstruckOrderMaterialController extends BaseRESTfulController {
     @ApiOperation(value = "修改提货单信息")
     @PostMapping("updateMaterialMes")
     public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
-        int i = omstruckOrderMaterialService.updateMaterialMes(map);
+        int i=0;
+        try {
+            i = omstruckOrderMaterialService.updateMaterialMes(map);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(map.get("saleOrderId"));
         if(saleOrderId != null){
             //         调用金蝶接口，将销售订单推送到金蝶系统

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

@@ -3182,6 +3182,7 @@
         OO.ORDER_NUMBER    "orderNumber",
         OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RS.SUPPLIER_NAME   "shipperName",
         RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
         RW.WAREHOUSE_NAME  "unloadName",
@@ -3206,6 +3207,7 @@
         LEFT JOIN RMS_CONSIGNEE RCON
         ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3223,6 +3225,7 @@
         OO.ORDER_NUMBER    "orderNumber",
         OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         OO.ORDER_TYPE      "orderType",
         RS.SUPPLIER_NAME  "shipperName",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
@@ -3236,6 +3239,7 @@
         LEFT JOIN RMS_CONSIGNEE RC2
         ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3253,6 +3257,7 @@
         OO.ORDER_NUMBER "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RW.WAREHOUSE_NAME "unloadName",
         OO.ORDER_TYPE "orderType",
         OO.ORDER_STATUS "orderStatus",
@@ -3283,6 +3288,7 @@
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3303,6 +3309,7 @@
         OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
         OO.ORDER_NUMBER    "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RS.SHIPPER_NAME    "loadName",
         RW.WAREHOUSE_NAME  "unloadName"
         FROM OMSTRUCK_ORDER OO
@@ -3317,6 +3324,7 @@
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3332,6 +3340,7 @@
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
@@ -3353,6 +3362,7 @@
         ASO.DELETED = 0
         and
         OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3671,6 +3681,7 @@
         OO.ORDER_NUMBER        "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         OO.ORDER_TYPE          "orderType",
         OO.ORDER_STATUS        "orderStatus",
         RS.SHIPPER_NAME        "shipperUnitName",
@@ -3699,6 +3710,7 @@
         LEFT JOIN RMS_WAREHOUSE RW1
         ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         where oo.order_id = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
         </if>
@@ -3780,6 +3792,7 @@
         OO.ORDER_NUMBER        "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         OO.ORDER_TYPE          "orderType",
         OO.ORDER_STATUS        "orderStatus",
         RS.SHIPPER_NAME        "shipperUnitName",
@@ -3839,6 +3852,7 @@
         LEFT JOIN RMS_WAREHOUSE RW1
         ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         where oo.order_id = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -3933,6 +3947,7 @@
         THEN RC.CAPACITY_NUMBER || '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || '）'
         END
         "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
@@ -4192,6 +4207,7 @@
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         RS.SHIPPER_NAME "shipperName",
         ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
@@ -4212,6 +4228,7 @@
         LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
         WHERE
         OO.ORDER_ID = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -4240,6 +4257,7 @@
         OO.ORDER_NUMBER        "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
         OO.ORDER_TYPE          "orderType",
         OO.ORDER_STATUS        "orderStatus",
         RS.SHIPPER_NAME        "shipperUnitName",
@@ -4258,6 +4276,7 @@
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
         where oo.order_id = #{orderId}
+        AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>