修改内转钢材到异地库

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

@@ -71,4 +71,6 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
 
   int updateWgmByOrderId(BigDecimal orderId);
 
+  BigDecimal getWarehouseBySendStation(Map<String, Object> map);
+
 }

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

@@ -217,6 +217,19 @@ public class PlatformWarehouseServiceImpl implements IPlatformWarehouseService {
     public int afterInwardOutbound(Map<String, Object> map) throws Exception {
         //需要参数 运输订单ID,人员ssoId
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        //根据运输订单id去查询是否有入库
+        if(rmsPwarehouseGridMapper.selectGridByOrderId(orderId) == null){
+            try {
+                List<Integer> warehouseIds = rmsPwarehouseGridMapper.getWarehouseIds(map);
+                BigDecimal warehouseId = DataChange.dataToBigDecimal(warehouseIds.get(0));
+                map.put("warehouseId",warehouseId);
+                List<Map<String,Object>> orderMaterialList = rmsPwarehouseGridMapper.getOrderMaterialList(orderId);
+                map.put("orderMaterialList",orderMaterialList);
+                inwardInbound(map);
+            } catch (Exception e) {
+                throw new Exception(e.getMessage());
+            }
+        }
         //根据运输订单ID,出库
         int i = wmspGridMaterialMapper.updateWgmByOrderId(orderId);
         //同步生成火运实绩

src/main/resources/application-prod.yml

@@ -14,9 +14,9 @@ openfeign:
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
 #图片上传配置
 piction:
   # path: /usr/share/nginx/html/image

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

@@ -830,11 +830,17 @@
           AND RM.MATERIAL_MODEL= #{materialModel}
           AND RM.MATERIAL_SPECIFICATION = #{materialSpecification}
   </select>
-  <delete id="deleteGridMaterial">
+
+    <delete id="deleteGridMaterial">
     update WMSP_GRID_MATERIAL WGM set WGM.DELETED = 1,UPDATE_TIME = #{now}
     where WGM.MATERIAL_ID in
     <foreach collection="thisMaterialDetailedInfos" item="item" open="(" separator="," close=")">
       #{item.materialSteelId}
     </foreach>
   </delete>
+  <select id="getWarehouseBySendStation" resultType="java.math.BigDecimal" parameterType="java.util.Map">
+    SELECT * FROM RMS_WAREHOUSE RW
+    WHERE RW.WAREHOUSE_NAME = #{sendStation}
+    AND R
+  </select>
 </mapper>