Merge remote-tracking branch 'origin/master'

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

@@ -425,11 +425,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
+                                                             String con,
                                                              Integer deleted) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, con,deleted);
     }
 
     @PostMapping("/getInwardContractPrice")
@@ -438,11 +439,12 @@ public class AMScontroller{
                                                              Integer pageNum,
                                                              Integer pageSize,
                                                              Integer apiId,
-                                                             Integer deleted) {
+                                                             Integer deleted,
+                                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted);
+        return amsFeign.getInwardContractPrice(mapValue, pageNum, pageSize, apiId, deleted,con);
     }
 
 
@@ -2074,4 +2076,12 @@ public class AMScontroller{
         return amsFeign.addSteelSaleOrderList(mapList);
     }
 
+    @PostMapping("/updateTransPrice")
+    @ApiOperation(value = "修改内转汽运单价")
+    public Map<String, Object> updateTransPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.updateTransPrice(mapValue);
+    }
 }

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

@@ -566,8 +566,8 @@ public class OMSController {
 
     @ApiOperation(value="根据运单id关闭订单")
     @PostMapping("/closeOmstruckOrder")
-    public Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId) {
-        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+    public Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> mapVal) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(mapVal);
         return map;
     }
 
@@ -838,12 +838,6 @@ public class OMSController {
     }
 
 
-    @ApiOperation(value = "查看所有实绩点")
-    @PostMapping("/getAllResultLineMes")
-    public Map<String, Object> getAllResultLineMes(Integer orderId, String orderNumber){
-        return omsFeign.getAllResultLineMes(orderId, orderNumber);
-    }
-
     @ApiOperation(value = "正常关闭运输订单")
     @PostMapping("/closeInwardOrder")
     public Map<String, Object> closeInwardOrder(Integer orderId){

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

@@ -250,4 +250,9 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
+
+    @GetMapping("/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address){
+        return otmsFeign.getLocationForAddress(address);
+    }
 }

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

@@ -275,6 +275,17 @@ public class QMSController extends BaseRESTfulController {
         return qmsFeign.isInCircle(longitude,latitude,capacityNo);
     }
 
+    @ApiOperation(value = "撤销进厂确认")
+    @PostMapping("/ctrlZQueueAllow")
+    public Map<String,Object> ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
+        return qmsFeign.ctrlZQueueAllow(map);
+    }
+
+    @PostMapping("/getStoreQueueList")
+    public Map<String, Object> getStoreQueueList(){
+        return qmsFeign.getStoreQueueList();
+    }
+
 
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({

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

@@ -226,11 +226,12 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer pageNum,
                                              Integer pageSize,
-                                             Integer apiId) {
+                                             Integer apiId,
+                                             String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.listAllOrders(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
 
@@ -654,11 +655,13 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          Integer status,
-                                                         @RequestParam(required = false) String con) {
+                                                         @RequestParam(required = false) String con,
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false) String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
     }
 
     @PostMapping("insertDeliveryNotice")
@@ -899,6 +902,15 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.deleteTmstrainLoadingResultByResultId(resultId);
     }
 
+    @ApiOperation(value = "通过主键删除车皮出库作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId){
+        return tmsTrainFeign.deleteOutBoundWagonById(resultId);
+    }
+
     //********************下拉框**********************
 
     @ApiOperation(value = "获取发站地点名称")
@@ -2187,8 +2199,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               String con) {
-        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
+                                               String con, String isPage) {
+        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con,isPage);
     }
 
 
@@ -2513,6 +2525,25 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName,supplierName);
     }
 
+    @ApiOperation(value = "查询待绑定的批次")
+    @PostMapping(value = "/findBatchForBind")
+    public Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String materialName,
+                                                     String foreignShipName){
+        if(map==null)
+            map=new HashMap<>();
+        return tmsshipFeign.findBatchForBind(map,apiId,pageNum,pageSize,materialName, foreignShipName);
+    }
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.bindBatch(map);
+    }
+
     @ApiOperation(value = "销售钢材统计报表")
     @PostMapping("/getSaleSteelReport")
     public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,

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

@@ -434,6 +434,31 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "二程船结算用：查询发货通知的已下发批次")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "502", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getBatchOfNotice")
+    public RESTfulResult getBatchOfNotice(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getBatchOfNotice(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
 
     @ApiModelProperty(value = "查询存在装船作业并且尚未计算水运费的批次")
     @ApiImplicitParams({

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

@@ -955,6 +955,7 @@ public class WMSController extends BaseRESTfulController {
                                              @RequestParam(value = "remark") String remark) {
         return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity,actuallyWeight,materialTheWeight,remark);
     }
+
     //修改预留转入库作业,针对预留
     @PostMapping(value = "/insertInbounds")
     public Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
@@ -1094,5 +1095,14 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> listAfterInwardOutbound(@RequestBody List<Map<String,Object>>mapList){
         return wmsFeign.listAfterInwardOutbound(mapList);
     }
+
+    @PostMapping(value = "/deleteInboundMaterial")
+    public Map<String,Object> deleteInboundMaterial(@RequestParam(value = "warehouseId") String warehouseId,
+                                             @RequestParam(value = "materialCode") String materialCode,
+                                             @RequestParam(value = "materialSpecification") String materialSpecification,
+                                             @RequestParam(value = "materialModel") String materialModel,
+                                             @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.deleteInboundMaterial(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+    }
 }
 

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

@@ -336,6 +336,7 @@ public interface AmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("con") String con,
                                        @RequestParam("deleted") Integer deleted
 
     );
@@ -1648,7 +1649,8 @@ public interface AmsFeign {
                                                       @RequestParam("pageNum") Integer pageNum,
                                                       @RequestParam("pageSize") Integer pageSize,
                                                       @RequestParam("apiId") Integer apiId,
-                                                      @RequestParam("deleted") Integer deleted);
+                                                      @RequestParam("deleted") Integer deleted,
+                                                      @RequestParam("con") String con);
     //根据物资查询运输物资单价
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
@@ -1779,4 +1781,6 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
     Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
 
+    @PostMapping("/api/v1/ams/amscontracttruckprices/updateTransPrice")
+    Map<String, Object> updateTransPrice(@RequestBody Map<String, Object> mapList);
 }

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

@@ -298,7 +298,7 @@ public interface OmsFeign {
 
     @ApiOperation(value="根据运单id关闭订单")
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
-    Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
+    Map<String, Object> closeOmstruckOrder(@RequestBody Map<String,Object> map);
 
 
     @ApiOperation(value="根据运单id修改运力")

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

@@ -139,4 +139,8 @@ public interface OtmsFeign {
 
     @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
+    //查询地址经纬度
+    @GetMapping("/api/v1/otms/pathDisplay/getLocationForAddress")
+    public RESTfulResult getLocationForAddress(@RequestParam("address") String address);
 }

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

@@ -143,6 +143,13 @@ public interface QmsFeign {
     Map<String, Object> isInCircle(@RequestParam String longitude,
                                    @RequestParam String latitude,
                                    @RequestParam String capacityNo);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/ctrlZQueueAllow")
+    Map<String, Object> ctrlZQueueAllow(Map<String, Object> map);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getStoreQueueList")
+    Map<String, Object> getStoreQueueList();
+
 //    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
 //     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
 //                                              @RequestParam("apiId") Integer apiId,

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

@@ -53,6 +53,9 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteTmstrainLoadingResultByResultId")
     public Map<String, Object> deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
 
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteOutBoundWagonById")
+    public Map<String, Object> deleteOutBoundWagonById(@RequestParam BigDecimal resultId);
+
     //下拉框
 
     @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getSendStationName")

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

@@ -502,8 +502,7 @@ public interface TmsTruckFeign {
                                    @RequestParam("pageNum") Integer pageNum,
                                    @RequestParam("pageSize") Integer pageSize,
                                    @RequestParam("startTime") String startTime,
-                                   @RequestParam("endTime") String endTime,
-                                                 @RequestParam("con") String con);
+                                   @RequestParam("endTime") String endTime, @RequestParam("con") String con, @RequestParam("isPage") String  isPage);
 
     @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
     Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -251,7 +251,8 @@ public interface TmsshipFeign {
     Map<String, Object> listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
                                 @RequestParam Integer pageNum,
                                 @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
+                                @RequestParam Integer apiId,
+                                      @RequestParam String con);
 
     /**
      * 展示船只信息
@@ -749,7 +750,9 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer  status,
-                                                  @RequestParam(required = false) String con);
+                                                  @RequestParam(required = false) String con,
+                                                  @RequestParam String startTime,
+                                                  @RequestParam String endTime);
 
     /**
      * 新增放货通知
@@ -852,4 +855,17 @@ public interface TmsshipFeign {
 
     @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
     Map<String, Object> getWagonWork(Map<String, Object> map);
+
+    @ApiOperation(value = "查询待绑定的批次id")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/findBatchForBind")
+    Map<String, Object> findBatchForBind(@RequestBody(required = false) Map<String, Object> map,
+                                         @RequestParam("apiId")Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("materialName")String materialName,
+                                         @RequestParam("foreignShipName")String foreignShipName);
+
+    @ApiOperation(value = "绑定批次")
+    @PostMapping(value = "api/v1/shipTms/dilbatchs/bindBatch")
+    Map<String, Object> bindBatch(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -917,4 +917,12 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/platformWarehouse/listAfterInwardOutbound")
     Map<String, Object> listAfterInwardOutbound(@RequestBody List<Map<String, Object>> mapList);
+
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/deleteInboundMaterial")
+    Map<String, Object> deleteInboundMaterial(@RequestParam("warehouseId") String warehouseId,
+                                              @RequestParam("materialCode") String materialCode,
+                                              @RequestParam("materialSpecification") String materialSpecification,
+                                              @RequestParam("materialModel") String materialModel,
+                                              @RequestParam("quantity") Integer quantity);
 }

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

@@ -235,6 +235,8 @@ public interface UniversalMapper {
 
     List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
 
+    List<Map<String,Object>> getBatchOfNotice(Map<String,Object> map);
+
     List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
 
     List<Map<String,Object>> getInwardSendStation();

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

@@ -266,4 +266,6 @@ public class UniversalServiceImpl implements UniversalService {
 
         System.out.println("订单关闭数为：" + result);
     }
+
+
 }

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

@@ -1217,6 +1217,32 @@
                  </if>
     </select>
 
+    <select id="getBatchOfNotice" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        DBI.BATCH_ID "batchId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        RM.MATERIAL_NAME "materialName",
+        RP.PORT_NAME "portName",
+        RPT.PORT_TYPE_NAME "portTypeName"
+        from AMSSHIP_DELIVERY_NOTICE ADN
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON ADN.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+        LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID=DBI.BATCH_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO ON APO.BATCH_ID=DB.BATCH_ID
+        LEFT JOIN RMS_PORT RP ON ADN.PORT_ID=RP.PORT_ID
+        LEFT JOIN RMS_PORT_TYPE RPT ON RP.PORT_TYPE_ID=RPT.PORT_TYPE_ID
+        LEFT JOIN RMS_MATERIAL RM ON DB.MATERIAL_ID=RM.MATERIAL_ID
+        WHERE RP.PORT_TYPE_ID IS NOT NULL
+        AND APO.PURCHASE_ORDER_NO IS NOT NULL
+        AND RP.DELETED=0
+        AND ADN.NOTICE_DISTRIBUTION_STATUS=1
+        AND ADN.DELETED=0
+        <if test="index!=null and index!=''.toString()">
+            and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+        </if>
+    </select>
+
     <select id="findBatchHavingLoad" resultType="java.util.Map">
         SELECT  distinct	db.BATCH_ID "batchId",
         db.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout