tiaji

src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ openfeign:
   ESFeign:
     url: ${ESFEIGN_URL:172.16.33.166:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   Im:

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

@@ -850,10 +850,11 @@
         SELECT QQR.RESULT_ID        "resultId",
                QQR.RESULT_TOTAL_ID  "resultTotalId",
                QQR.RESULT_START_TIME    "resultStartTime",
+               RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
                RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "grid",
                RM.MATERIAL_ID       "materialId",
                RM.MATERIAL_NAME     "materialName",
-               RM.MATERIAL_SPECIFICATION    "materialSpecification",
+               RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')'    "materialSpecification",
                RM.MATERIAL_MODEL        "materialModel",
                QQL.LIST_ID              "listId",
                RC.CAPACITY_NUMBER  "capacityNumber",
@@ -878,6 +879,9 @@
             LEFT JOIN RMS_CAPACITY RC ON QQL.CAPACITY_ID = RC.CAPACITY_ID
             LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
             LEFT JOIN RMS_GATEPOST  RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+            LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
         <where>
             <if test="capacityNumber != null">
                 instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
@@ -916,7 +920,7 @@
                QQSL.SPELLING_RESULT_ID  "spellingResultId",
                 RM.MATERIAL_ID       "materialId",
                 RM.MATERIAL_NAME     "materialName",
-                RM.MATERIAL_SPECIFICATION    "materialSpecification",
+                RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_MODEL||')'    "materialSpecification",
                 RC.CAPACITY_ID           "capacityId",
                 RM.MATERIAL_MODEL        "materialModel",
                QQSL.ENTRY_SURE_TIME      "sureTime",
@@ -925,6 +929,7 @@
                OO.DRIVER_TEL            "driverTel",
                OO.ORDER_ID              "orderId",
                RG.GATEPOST_NAME             "gatepostName",
+               RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
               (
                   select count(QQSL2.SPELLING_RESULT_ID) from QMS_QUEUE_SPELLING_LIST QQSL2
                   where QQSL.SPELILING_NUM = QQSL2.SPELILING_NUM
@@ -940,6 +945,9 @@
             left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
             left join OMSTRUCK_ORDER OO on TTR.ORDER_ID = OO.ORDER_ID
             LEFT JOIN RMS_GATEPOST  RG ON QQR.GATEPOST_ID = RG.GATEPOST_ID
+            LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+            LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
         <where>
             <if test="capacityNumber != null">
                 instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0