合并冲突

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /*
  * 后台处理程序
  */

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

@@ -728,8 +728,8 @@ public class OMSController {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("/getCapacityAllOrder")
-    public Map<String, Object> getCapacityAllOrder(String capacityNumber){
-        return omsFeign.getCapacityAllOrder(capacityNumber);
+    public Map<String, Object> getCapacityAllOrder(String capacityNumber, String date){
+        return omsFeign.getCapacityAllOrder(capacityNumber,date);
     }
 
     @ApiOperation(value = "根据运单id关闭运输订单")

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

@@ -247,6 +247,20 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "船名边输边查")
+    @PostMapping("/getShipNameMesByLike")
+    public  RESTfulResult getShipNameMesByLike(@RequestParam("index") String index,Integer materialId) {
+        Map<String, Object> map = new HashMap<>();
+        if(materialId != null){
+            map.put("materialId",materialId);
+        }
+        if(index != null){
+            map.put("index","%" + index + "%");
+        }
+        List<Map<String,Object>>list = universalMapper.getShipNameMesByLike(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查用车单位")
     @PostMapping("/getRequireUnitName")
     public RESTfulResult getRequireUnitName(@RequestParam("index") String index) {

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -405,7 +405,7 @@ public interface OmsFeign {
 
     @ApiOperation(value = "该车牌号下的所有订单号 以及 订单ID")
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
-    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
+    Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber,@RequestParam  String date);
 
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")

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

@@ -8,4 +8,9 @@ import java.util.Map;
 public interface BackgroundProcessingMapper {
     //通过采购订单号关闭一车多趟
     int closePurOrderMoreTrips(String purchaseOrderNo);
+
+    int updatePurOrgId(Integer orderId);
+
+    Integer getOrderType(Integer orderId);
+
 }

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

@@ -186,6 +186,10 @@ public interface UniversalMapper {
     //查询已下发订单数量  -->APP小红点
     Integer getOrderNum(String capacityNumber);
 
+
     //仓库月台下拉框
     List<Map<String, Object>> getSteelWarehouse();
+
+    List<Map<String, Object>> getShipNameMesByLike(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/service/IBackgroundProcessService.java

@@ -0,0 +1,5 @@
+package com.steerinfo.dil.service;
+
+public interface IBackgroundProcessService {
+    int updatePurOrgId(Integer orderId);
+}

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

@@ -1,8 +1,23 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.service.IBackgroundProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service(value = "backgroundProcessingService")
-public class BackgroundProcessingServiceImpl {
+public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
 
+    @Autowired
+    BackgroundProcessingMapper backgroundProcessingMapper;
+
+    @Override
+    public  int updatePurOrgId(Integer orderId) {
+        //获取订单类型
+        Integer orderType = backgroundProcessingMapper.getOrderType(orderId);
+        if(orderType == 10 || orderType == 20){
+            backgroundProcessingMapper.updatePurOrgId(orderId);
+        }
+        return 1;
+    }
 }

src/main/resources/application-dev.yml

@@ -22,17 +22,17 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8093}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 piction:

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

@@ -11,4 +11,10 @@
     <update id="updatePurOrderOrgId" parameterType="java.util.Map">
 
     </update>
+    <update id="updatePurOrgId">
+    </update>
+    <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+        select OO.ORDER_TYPE from OMSTRUCK_ORDER OO
+        where oo.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -687,12 +687,17 @@
         from (
                  select DB.BATCH_ID                                                         "batchId",
                         DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
+
                         CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
                  from DIL_BATCH DB
                           left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
                  where DB.RESULT_FOREIGN_SHIP_NAME is not null
+                <if test="materialId != null">
+                    and DB.MATERIAL_ID = #{materialId}
+                </if>
              )
         where instr("foreignShipName", #{index}) > 0
+
     </select>
 
     <select id="getPortId" resultType="java.util.Map">
@@ -955,6 +960,7 @@
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
               AND OO.ORDER_STATUS = 4
     </select>
+
     
     <select id="getSteelWarehouse" resultType="java.util.Map">
         SELECT RW.WAREHOUSE_ID   "id",
@@ -962,4 +968,20 @@
         FROM RMS_WAREHOUSE RW
         WHERE RW.WAREHOUSE_TYPE_ID = 1
     </select>
+
+    <select id="getShipNameMesByLike" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DB.RESULT_FOREIGN_SHIP_NAME "value",
+               RS.SUPPLIER_ID "supplierId",
+               RS.SUPPLIER_NAME "supplierName",
+               APO.PURCHASE_ORDER_ID "purchaseOrderId",
+               APO.PURCHASE_ORDER_NO  "purchaseOrderNo"
+               FROM DIL_BATCH DB
+               left join AMS_PURCHASE_ORDER APO
+               ON APO.BATCH_ID = DB.BATCH_ID
+               left join RMS_SUPPLIER RS
+               ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+               WHERE  APO.PURCHASE_ORDER_ID IS NOT NULL
+               and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
+               and DB.MATERIAL_ID = #{materialId}
+    </select>
 </mapper>