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

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

@@ -896,4 +896,10 @@ public class OMSController {
         }
         return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
     }
+
+    @ApiOperation(value = "通过运单id或者运单号查询车辆是否放行")
+    @PostMapping("canCapacityEnfactory")
+    public Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue) {
+        return omsFeign.canCapacityEnfactory(mapValue);
+    }
 }

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

@@ -181,6 +181,10 @@ public class OTMSController {
     @PostMapping("/getReceivingPhotoByUrl")
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
         Map<String,Object> map=otmsFeign.getReceivingPhotoByUrl(orderNumber);
+        if(map==null){
+          map =new HashMap<>();
+          return  map;
+        }
         if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
             String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
             map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
@@ -206,6 +210,7 @@ public class OTMSController {
             String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto3").toString());
             map.put("otherPhoto3",resultSignedNotePhoto);
         }
+
         return map;
     }
 

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

@@ -808,8 +808,10 @@ public class TMSController extends BaseRESTfulController {
                                                     Integer resultType,
                                                     Integer materialId,
                                                     Integer supplierId,
-                                                    String con) {
-        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con);
+                                                    String con,
+                                                    String startTime,
+                                                    String endTime) {
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con,startTime,endTime);
     }
 
 
@@ -1961,8 +1963,20 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
             Integer apiId,
             Integer pageNum,
-            Integer pageSize,Integer resultType,String con) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,con);
+            Integer pageSize, String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+    }
+
+    @ApiOperation(value = "查询计量数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(209)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/getWeightResult")
+    public Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
+        return tmsTrainFeign.getWeightResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
     }
 
     @ApiOperation(value = "批量新增计量委托")

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

@@ -519,5 +519,8 @@ public interface OmsFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("orderId") Integer orderId,
                                           @RequestParam("orderStatus") Integer orderStatus);
+
+    @PostMapping("api/v1/oms/omstruckorders/canCapacityEnfactory")
+    Map<String, Object> canCapacityEnfactory(@RequestBody Map<String, Object> mapValue);
 }
 

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

@@ -33,7 +33,9 @@ public interface TmsTrainFeign {
                                               @RequestParam("resultType") Integer resultType,
                                               @RequestParam("materialId")Integer materialId,
                                               @RequestParam("supplierId")Integer supplierId,
-                                                    @RequestParam("con") String con);
+                                                    @RequestParam("con") String con,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
@@ -252,9 +254,22 @@ public interface TmsTrainFeign {
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
                                                @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
                                                @RequestParam("con") String con
                                                );
 
+    @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/getWeightResult")
+    Map<String, Object> getWeightResult( @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("startTime") String startTime,
+                                               @RequestParam("endTime") String endTime,
+                                               @RequestParam("con") String con
+    );
+
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:

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

@@ -844,10 +844,12 @@
         RM.MATERIAL_CODE "materialCode",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel",
-        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel"
+        RM.MATERIAL_NAME || RM.MATERIAL_MODEL "nameModel",
+        RM.MATERIAL_COUNT "materialCount"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
         AND RM.MATERIAL_ID != 2533
+        AND RM.MATERIAL_ID != 3465
         <if test="materialNameText != null">
             AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>
@@ -882,7 +884,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" ASC
+            order by "materialCount" DESC
         </if>
     </select>