Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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/QMSController.java

@@ -28,8 +28,8 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> map){
-        return qmsTruckFeign.addQueueResult(map);
+    public Map<String, Object> addQueueResult(String vno){
+        return qmsTruckFeign.addQueueResult(vno);
     }
 
 
@@ -38,8 +38,8 @@ public class QMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
     })
     @PostMapping("/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
-        return qmsTruckFeign.addQueueList(mapValue);
+    public Map<String, Object> addQueueList(String resultId){
+        return qmsTruckFeign.addQueueList(resultId);
     }
 
     @ApiOperation(value="指令接收")
@@ -94,10 +94,11 @@ public class QMSController extends BaseRESTfulController {
                                                      Integer apiId,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer gridId,
-                                                     String con
+                                                     Integer locationId,
+                                                     String capacityNumber,
+                                                     Integer isSpelling
     ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId,con);
+        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, locationId,capacityNumber, isSpelling);
     }
 
 
@@ -381,4 +382,22 @@ public class QMSController extends BaseRESTfulController {
                                                        String con
     ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
+
+
+    @ApiOperation(value="钢材科允许进厂")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/allowEnFactory")
+    public Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.allowEnFactory(mapValue);
+    }
+
+    @ApiOperation(value="APP端司机查看排队信息")
+    @GetMapping("getQueueResultByTotalId")
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        return  qmsTruckFeign.getQueueResultByTotalId(resultTotalId);
+    }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.config.ImageFileUtils;
 import com.steerinfo.dil.feign.TmsshipFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
@@ -35,6 +36,8 @@ public class TMSController extends BaseRESTfulController {
     TmsshipFeign tmsshipFeign;
     @Autowired
     UniversalMapper universalMapper;
+    @Autowired
+    private ImageFileUtils imageFileUtils;
     /*======================================船运==========================================*/
 
     /**
@@ -2165,4 +2168,18 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
         return tmsTruckFeign.getReceivingPhoto(orderNumber);
     }
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
+        Map<String,Object> map=tmsTruckFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
+            String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
+            map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
+        }
+        if(map.containsKey("resultSignedNotePhoto") && map.get("resultSignedNotePhoto")!=null){
+            String resultSignedNotePhoto = (String) imageFileUtils.downloadFile(map.get("resultSignedNotePhoto").toString());
+            map.put("resultSignedNotePhoto",resultSignedNotePhoto);
+        }
+        return map;
+    }
 }

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) {
@@ -816,4 +830,10 @@ public class UniversalController extends BaseRESTfulController {
         }
         return 1;
     }
+
+    @ApiModelProperty(value = "获取仓库月台")
+    @GetMapping("/getSteelWarehouse")
+    public List<Map<String, Object>> getSteelWarehouse(){
+        return universalMapper.getSteelWarehouse();
+    }
 }

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/feign/QmsTruckFeign.java

@@ -23,11 +23,11 @@ public interface QmsTruckFeign {
      */
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
-    public Map<String, Object> addQueueResult(@RequestBody(required = false) Map<String, Object> mapValue);
+    public Map<String, Object> addQueueResult( @RequestParam("vno")String vno);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
-    public Map<String, Object> addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
+    public Map<String, Object> addQueueList(@RequestParam("resultId")String resultId);
 
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
@@ -61,8 +61,9 @@ public interface QmsTruckFeign {
                                                      @RequestParam("apiId") Integer apiId,
                                                      @RequestParam("pageNum") Integer pageNum,
                                                      @RequestParam("pageSize") Integer pageSize,
-                                                     @RequestParam("gridId") Integer gridId,
-                                                     @RequestParam("con")String con
+                                                     @RequestParam("locationId") Integer locationId,
+                                                     @RequestParam("capacityNumber")String capacityNumber,
+                                                     @RequestParam("isSpelling")Integer isSpelling
     );
 
 
@@ -190,4 +191,10 @@ public interface QmsTruckFeign {
                                                 @RequestParam("pageSize") Integer pageSize,
                                                 @RequestParam("con")String con
     );
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
+    Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
+    Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
 }

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

@@ -597,6 +597,11 @@ public interface TmsTruckFeign {
                                                   @RequestParam(name = "apiId",defaultValue = "472") Integer apiId,
                                                   @RequestParam(name = "pageNum") Integer pageNum,
                                                   @RequestParam(name = "pageSize") Integer pageSize);
+
+
+    @ApiOperation(value = "获取收货作业照片")
+    @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
+    public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
 }
 
 

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

@@ -185,4 +185,11 @@ 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,4 +960,28 @@
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
               AND OO.ORDER_STATUS = 4
     </select>
+
+    
+    <select id="getSteelWarehouse" resultType="java.util.Map">
+        SELECT RW.WAREHOUSE_ID   "id",
+               RW.WAREHOUSE_NAME "value"
+        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>