'委托'

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

@@ -246,6 +246,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }catch (Exception ex){
 
                 }
+                bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 2:
             case 3:

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

@@ -104,7 +104,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 String loadingPace = (String) map.get("warehouseName");
                 String url = "http://172.16.33.122:44325/api/logistics/modifyLoadPlace";
                 String ysdd = (String) map.get("orderNumber");
+                String memo = (String) map.get("insertUpdateRemark");
                 String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
+                if (memo != null) {
+                    sendUrl += "&memo=" + memo;
+                }
                 String jsonData = getRequestUtils.doGet(sendUrl);
                 System.out.println(sendUrl);
                 System.out.println("委托已发送" + jsonData);

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1864,6 +1864,7 @@
                     ASM.SALE_MATERIAL_ID "saleMaterialId",
                     ASM.MATERIAL_NUMBER "materialNum",
                     ASM.EAS_PRIMARY_ID "closeEntryId",
+                    ASM.DELETED "deletedStatus",
                     RC.CONSIGNEE_COMPANY_NAME "consigneeName",
                     ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
                     RS.SHIPPER_NAME "shipperName",
@@ -1903,6 +1904,7 @@
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
+                    OO.ORDER_STATUS              "carStatus",
                     DECODE(ASO.SALE_ORDER_STATUS,0,'销售订单未上报',
                                                  1,'销售订单已上报',
                                                  2,'销售已提交',