合并

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

@@ -86,4 +86,7 @@ public interface WmspOutboundResultMapper extends IBaseMapper<WmspOutboundResult
 
     //通过钢材物资ID查询仓库Id
     Integer getWarehouseIdBySteelMaterialId(BigDecimal steelMaterialId);
+
+    //通过出库物资中间表ID和物资ID查询炉号和物资件数
+    List<Map<String, Object>> getLuHaoAndNumber(@Param("resultMaterialId") BigDecimal resultMaterialId, @Param("materialId") BigDecimal materialId);
 }

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

@@ -491,6 +491,15 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         Map<String, Object> mesMap = wmspOutboundResultMapper.getOutboundMesByMateAndResultId(resultId, materialId);
         //通过钢材物资ID查询仓库ID
         Integer warehouseId = wmspOutboundResultMapper.getWarehouseIdBySteelMaterialId(new BigDecimal(outBoundMaterialDetailedInfo.getMaterialSteelId()));
+        List<Map<String, Object>> luHaoNumberList = wmspOutboundResultMapper.getLuHaoAndNumber(DataChange.dataToBigDecimal(mesMap.get("resultMaterialId")), 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("/");
+        }
+        mesMap.put("numberOfFurnaces", sb.toString());
         mesMap.put("materialId", materialId);
         mesMap.put("warehouseId", warehouseId);
         Map<String, Object> returnMap = tmstruckFeign.addSaleLoadResult(mesMap);

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1148,13 +1148,13 @@
            MIN(WOSR.RESULT_LOAD_TIME)   "loadStartTime",
            WOR.BILL_LADING_ID           "orderId",
            WOSR.LOAD_ID                "loadId",
-           WOR.INSERT_UPDATE_REMARK    "insertUpdateRemark"
-
+           WOR.INSERT_UPDATE_REMARK    "insertUpdateRemark",
+           WORM.RESULT_MATERIAL_ID     "resultMaterialId"
     from WMSP_OUTBOUND_RESULT WOR
     LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM on WOR.RESULT_ID = WORM.OUTBOUND_RESULT_ID
     LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT WOSR ON WORM.RESULT_MATERIAL_ID = WOSR.RESULT_MATERIAL_ID
     WHERE WOR.RESULT_ID = #{resultId} and WORM.MATERIAL_ID = #{materialId}
-    group by WOSR.LOAD_ID, WOR.INSERT_UPDATE_REMARK,WOR.BILL_LADING_ID
+    group by WOSR.LOAD_ID, WOR.INSERT_UPDATE_REMARK,WOR.BILL_LADING_ID, WORM.RESULT_MATERIAL_ID
   </select>
 
   <select id="getWarehouseIdBySteelMaterialId" parameterType="java.math.BigDecimal" resultType="int">
@@ -1172,4 +1172,17 @@
       </if>
     </if>
   </sql>
+
+
+  <select id="getLuHaoAndNumber" resultType="map">
+    SELECT RMS.MATERIAL_FURNACE_NUMBER  "materialFurnaceNumber",
+           COUNT(WOSR.RESULT_ID)        "materialNum"
+    FROM WMSP_OUTBOUND_RESULT_MATERIAL WORM
+    LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT WOSR ON WORM.RESULT_MATERIAL_ID = WOSR.RESULT_MATERIAL_ID
+    LEFT JOIN WMSP_INBOUND_RESULT WIR ON WOSR.INBOUND_RESULT_ID = WIR.INBOUND_ID
+    LEFT JOIN RMS_MATERIAL_STEEL RMS ON WIR.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
+    WHERE WORM.RESULT_MATERIAL_ID = #{resultMaterialId} AND WORM.MATERIAL_ID = #{materialId}
+    GROUP BY RMS.MATERIAL_FURNACE_NUMBER
+  </select>
+
 </mapper>