修改

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

@@ -1122,22 +1122,22 @@ public class UniversalController extends BaseRESTfulController {
         for(Map<String,Object>map1:mapList){
             BigDecimal orderId = DataChange.dataToBigDecimal(map1.get("orderId"));
             List<Map<String,Object>> materialList = universalMapper.getMaterialList(map1);
-            for (Map<String,Object>materialMap:materialList){
-                BigDecimal materialId = DataChange.dataToBigDecimal(materialMap.get("materialId"));
-                //根据运输订单ID和物资ID去查询炉号
-                List<Map<String, Object>> luHaoNumberList = universalMapper.getLuhaoNum(orderId,materialId);
-                StringBuilder sb = new StringBuilder();
-                for (Map<String, Object> luHaoMap : luHaoNumberList) {
-                    sb.append(luHaoMap.get("materialFurnaceNumber"));
-                    sb.append("-");
-                    sb.append(luHaoMap.get("materialNum"));
-                    sb.append("/");
-                }
-                if(luHaoNumberList.size() > 0){
-                    sb.deleteCharAt(sb.length() - 1);
-                    materialMap.put("luhao",sb.toString());
-                }
-            }
+            //for (Map<String,Object>materialMap:materialList){
+            //    BigDecimal materialId = DataChange.dataToBigDecimal(materialMap.get("materialId"));
+            //    //根据运输订单ID和物资ID去查询炉号
+            //    List<Map<String, Object>> luHaoNumberList = universalMapper.getLuhaoNum(orderId,materialId);
+            //    StringBuilder sb = new StringBuilder();
+            //    for (Map<String, Object> luHaoMap : luHaoNumberList) {
+            //        sb.append(luHaoMap.get("materialFurnaceNumber"));
+            //        sb.append("-");
+            //        sb.append(luHaoMap.get("materialNum"));
+            //        sb.append("/");
+            //    }
+            //    if(luHaoNumberList.size() > 0){
+            //        sb.deleteCharAt(sb.length() - 1);
+            //        materialMap.put("luhao",sb.toString());
+            //    }
+            //}
             map1.put("materialList",materialList);
         }
         return success(mapList);
@@ -1270,4 +1270,9 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult getColumShowHideScheme(@RequestBody Map<String,Object> map) {
         return success(universalService.getColumShowHideScheme(map));
     }
+
+    @GetMapping("/getWlUrl")
+    public String getWlUrl() {
+        return universalMapper.getWlUrl();
+    }
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -299,4 +299,6 @@ public interface UniversalMapper {
 
     int updateRemarkPic(Map<String, Object> map);
 
+    String getWlUrl();
+
 }

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

@@ -460,6 +460,7 @@ public class UniversalServiceImpl implements UniversalService {
             mapList.add(dilRoleOrgcodeTable);
         }
         //将该用户的所有方案都变成未启用状
+        dilRoleOrgcodeTableMapper.updateEnableStatus(map);
         if(mapList.size() > 0) {
             //然后再批量新增进去
             i += dilRoleOrgcodeTableMapper.batchInsert(mapList);

src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:72.16.33.166:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:

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

@@ -1317,13 +1317,16 @@
                OO.ORDER_NUMBER "orderNumber",
                OO.ORDER_ID "orderId",
                RPG.INSERT_TIME "insertTime",
+               RPG.UPDATE_TIME  "updateTime",
                DECODE(WGM.DELETED, 1, '已出库', '未出库') "gmStatus",
                OTO.ORDER_WAGON_NO "wagonNo",
                OTO.ORDER_ID     "trainOrderId",
                RPG.INSERT_UPDATE_REMARK "remark",
                RP.PERSONNEL_NAME    "personName",
+               RP1.PERSONNEL_NAME   "outPersonName",
                RAS.ARRIVAL_NAME     "toTheStation",
-               RAS1.ARRIVAL_NAME    "sendStation"
+               RAS1.ARRIVAL_NAME    "sendStation",
+               RC2.CONSIGNEE_COMPANY_NAME   "consigneeName"
         FROM WMSP_GRID_MATERIAL WGM
                  LEFT JOIN RMS_PWAREHOUSE_GRID RPG
                            ON RPG.GRID_ID = WGM.GRID_ID
@@ -1337,12 +1340,18 @@
                            ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                  LEFT JOIN RMS_PERSONNEL RP
                            ON RP.PERSONNEL_SSO_ID = RPG.INSERT_USERNAME
+                 LEFT JOIN RMS_PERSONNEL RP1
+                           ON RP1.PERSONNEL_SSO_ID = RPG.UPDATE_USERNAME
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
                            ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN AMS_SALE_MATERIAL ASM
                            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                 LEFT JOIN RMS_CONSIGNEE  RC2
+                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_ID
                  LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
                            ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
                  LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
@@ -1358,10 +1367,17 @@
     </select>
     <select id="getMaterialList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT RM.MATERIAL_ID "materialId",
-               RM.MATERIAL_NAME||'-'||RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_SPECIFICATION||')'||'-'||OOM.ORDER_MATERIAL_NUMBER||'件' "materialName"
+               RM.MATERIAL_NAME||'-'||RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_SPECIFICATION||')'||'-'||OOM.ORDER_MATERIAL_NUMBER||'件' "materialName",
+               TWR.INSERT_UPDATE_REMARK "weightNo"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        AND TWR.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
         WHERE OOM.ORDER_ID = #{orderId}
     </select>
     <select id="getLuhaoNum" resultType="java.util.Map" parameterType="decimal">
@@ -1636,9 +1652,14 @@
       AND DTCR.TABLE_NAME = #{tableName}
       AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
     </select>
+
     <update id="updateRemarkPic">
         UPDATE OMSTRUCK_ORDER
         SET URL = #{urls}
         WHERE ORDER_ID = #{orderId}
     </update>
+    <select id="getWlUrl" resultType="java.lang.String">
+        SELECT DL.VERSION_VALUE FROM DIL_VERSION DL
+        WHERE DL.VERSION_ID = 11
+    </select>
 </mapper>