'零星物资'

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

@@ -807,6 +807,7 @@ public class AMScontroller{
         return amsFeign.updateOpenDispatchSaleOrder(mapVal);
     }
 
+
     //焦炭、水渣日计划
     //新增
     @PostMapping("/addTruckRailDayPlan")

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

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.DilVersionServiceImpl;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/12/14 22:42
+ */
+@RestController
+@RequestMapping("/appVersion")
+public class DilVersionController {
+
+    @Autowired
+    DilVersionServiceImpl dilVersionService;
+
+    @ApiOperation(value = "查询版本号")
+    @PostMapping("/checkVersion/{version}")
+    public int deleteTruckRailDayPlan(@PathVariable("version") String version) {
+        return dilVersionService.compareAppVersion(version);
+    }
+
+    @ApiOperation(value = "新增版本号")
+    @PostMapping("/addAppVersion/{version}")
+    public String addAppVersion(@PathVariable("version") String version) {
+        return dilVersionService.addAppVersion(version);
+    }
+}

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

@@ -629,4 +629,23 @@ public class OMSController {
     public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
         return omsFeign.getOrderResult(map);
     }
+
+    @ApiOperation(value = "查询未下发的零星物资订单")
+    @PostMapping("/getOthersOrderMesToSend")
+    public Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer type,
+                                                 Integer orderStatus,
+                                                 Integer carrierId,
+                                                 String  con) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
+    }
+
+    @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
+    @PostMapping("/updateOmstruckOrder")
+    public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        return omsFeign.updateOmstruckOrder(map);
+    }
 }

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

@@ -199,6 +199,9 @@ public class RMScontroller {
     ){
         return   rmsFeign.getMaterialList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
+
+
+
     @ApiOperation(value="新增物资", notes="根据rmsMaterial对象创建")
     @ApiImplicitParam(name = "rmsMaterial", value = "详细实体rmsMaterial", required = true, dataType = "rmsMaterial")
     @PostMapping(value = "/insertMaterial")
@@ -416,7 +419,12 @@ public class RMScontroller {
     public Map<String, Object> deleteTruckCalculate(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteTruckCalculate(id);
     }
-
+    @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
+    @ApiImplicitParam(name = "汽车衡物资中间表id", value = "id", required = true, dataType = "int")
+    @PostMapping(value = "/deleteTruckCalculateMaterial/{id}")
+    public Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteTruckCalculateMaterial(id);
+    }
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCarDriver信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
@@ -433,7 +441,15 @@ public class RMScontroller {
     public Map<String,Object> getTruckCalculateById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getTruckCalculateById(id);
     }
-
+    @PostMapping("/getCalculateOfMaterialList")
+    @ApiOperation(value="根据id查询汽车横下的物资表")
+    public Map<String,Object> getCalculateOfMaterialList(@RequestBody(required = false)Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         BigDecimal truckCalculateId){
+        return rmsFeign.getCalculateOfMaterialList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,truckCalculateId);
+    }
 
     @PostMapping("/getTruckCalculateList")
     @ApiOperation(value = "模糊查询汽车衡")
@@ -445,13 +461,11 @@ public class RMScontroller {
 
         return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
-
-    @ApiOperation(value="新增汽车衡信息", notes="根据rmsWarehouse对象创建")
-    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
-    @PostMapping(value = "/insertWarehouse")
-    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map){
-        return rmsFeign.insertWarehouse(map);
+    @ApiOperation(value="新增汽车衡下的物资", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsTruckCalculateMaterial", value = "详细实体rmsTruckCalculateMaterial", required = true, dataType = "rmsTruckCalculateMaterial")
+    @PostMapping(value = "/insertTruckCalculateOfMaterial")
+    public Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTruckCalculateOfMaterial(map);
     }
     @ApiOperation(value="删除", notes="根据rmsCarrier对象创建")
     @ApiImplicitParam(name = "仓库id", value = "id", required = true, dataType = "int")
@@ -580,6 +594,29 @@ public class RMScontroller {
         return   rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
+    @ApiOperation(value="删除", notes="根据rulesId删除")
+    @ApiImplicitParam(name = "门岗规则id", value = "rulesId", required = true, dataType = "int")
+    @PostMapping(value = "/deleteGatepostRules/{rulesId}")
+    public Map<String, Object> deleteGatepostRules(@PathVariable("rulesId") BigDecimal rulesId) {
+        return rmsFeign.deleteGatepostRules(rulesId);
+    }
+    @ApiOperation(value="新增门岗规则")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "门岗规则", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertGatepostRule")
+    public Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.insertGatepostRule(mapValue);
+    }
+    @ApiOperation(value="获取门岗名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "门岗id", value = "gatepostId", required = true, dataType = "int")
+    })
+    @PostMapping("/getGatepostName/{gatepostId}")
+    public Map<String, Object> getGatepostName(@PathVariable("gatepostId") BigDecimal gatepostId){
+        return rmsFeign.getGatepostName(gatepostId);
+    }
+
     @PostMapping("/getMaterialTypeList")
     @ApiOperation(value = "框计算物资种类")
     public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -650,4 +687,74 @@ public class RMScontroller {
     public Map<String, Object> getVehicleTypeId() {
         return rmsFeign.getVehicleTypeId();
     }
+    //通知
+    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+
+    @PostMapping(value = "/getNoticeList")
+    public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getNoticeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增公告信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertNotice")
+    public Map<String, Object> insertNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertNotice(map);
+    }
+
+    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateNotice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteNotice/{id}")//BigDecimal
+    public Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteNotice(id);
+    }
+
+
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getNoticeById/{id}")
+    public Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getNoticeById(id);
+    }
+
+
+//*******************************下拉框************************
+
+    @GetMapping("getNoticeTypeId")
+    @ApiOperation(value = "得到公告类型Id")
+    public Map<String,Object> getNoticeTypeId(){
+        return rmsFeign.getNoticeTypeId();
+    }
+
+    @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
+    @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
+
+    @PostMapping(value = "/insertWarehouse")
+    public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertWarehouse(map);
+    }
 }

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

@@ -326,6 +326,7 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          String con) {
+
         return tmsshipFeign.getWaterQualityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
@@ -356,7 +357,8 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("addWaterQualityResult")
     @ApiOperation(value = "新增水分质检")
     Map<String, Object> addWaterQualityResult(@RequestBody Map<String, Object> map) {
-        return tmsshipFeign.addWaterQualityResult(map);
+        Map<String, Object> stringObjectMap = tmsshipFeign.addWaterQualityResult(map);
+        return stringObjectMap;
     }
 
     /**
@@ -420,15 +422,16 @@ public class TMSController extends BaseRESTfulController {
                                                            Integer pageNum,
                                                            Integer pageSize,
                                                            Integer apiId,
-                                                           String con) {
+                                                           String con,
+                                                           String status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getShipMentInstructionsList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
     }
 
     @PostMapping("getShipmentInstructions/{instructionsId}")
-    @ApiOperation(value = "查询装船指令")
+    @ApiOperation(value = "下发装船指令")
     Map<String, Object> getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId) {
         return tmsshipFeign.getShipmentInstructions(instructionsId);
     }
@@ -439,10 +442,10 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.deleteByPrimaryKey(instructionsId);
     }
 
-    @PostMapping("updateIssueStatus/{shipmentInstructionsId}")
+    @PostMapping("sendShipmentInstructionsStatus/{shipmentInstructionsId}")
     @ApiOperation(value = "修改状态")
-    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
-        return tmsshipFeign.updateIssueStatus(shipmentInstructionsId);
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
+        return tmsshipFeign.sendShipmentInstructionsStatus(shipmentInstructionsId);
     }
 
     @PostMapping("updateShipmentInstructions")
@@ -1825,6 +1828,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
         return tmsTruckFeign.getDeliveryOrder(orderNumber);
     }
+    @ApiOperation(value="模糊查询江船名 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "state", value = "用户输入的江船名", required = false, dataType = "String"),
+    })
+    @PostMapping("getShipNameList")
+    public Map<String, Object> getShipNameList(@RequestParam(value = "state") String state){
+        return tmsshipFeign.getShipNameList(state);
+    }
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
@@ -1861,4 +1872,24 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
         return tmsTrainFeign.batchSendMeasureCommission(map);
     }
+
+
+      //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("/getMoistureAndInstallations")
+    public Map<String,Object> getMoistureAndInstallations(@RequestBody(required=false) Map<String,Object> map){
+        return tmsshipFeign.getMoistureAndInstallations(map);
+    }
+
+
+    @ApiOperation(value="查询辅料燃料统计报表")
+    @PostMapping("/getRLFLReport")
+    public Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer orderType
+    ){
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType);
+    }
+
 }

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

@@ -12,8 +12,14 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
+
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -163,6 +169,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
+    @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")
+    public RESTfulResult getMaterialMesByOrderId(@PathVariable("orderId") Integer orderId){
+        List<Map<String, Object>> mes = universalMapper.getOrderMaterialMesByOrderId(new BigDecimal(orderId));
+        return success(mes);
+    }
+
     @ApiModelProperty(value = "模糊查询物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -35,11 +35,12 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public Map<String, Object> getWmsInboundResult(Map<String, Object> mapValue,
+    public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
                                                    Integer pageNum,
-                                                   Integer pageSize) {
-        return wmsFeign.getWmsInboundResult(mapValue, apiId, pageNum, pageSize);
+                                                   Integer pageSize,
+                                                   String  con) {
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("getWmspOutboundResult")
@@ -51,7 +52,7 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String con) {
+                                                     String  con) {
         return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
 
@@ -164,7 +165,6 @@ public class WMSController extends BaseRESTfulController {
         return resTfulResult;
     }
     //获取扫描实绩
-    //钢材异地库扫描入库
     @PostMapping("/getScanResult")
     public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
         Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
@@ -186,8 +186,9 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
                                                          Integer pageNum,
                                                          Integer pageSize,
-                                                         Integer apiId) {
-        return wmsFeign.getWmspIntransitInventory(apiId, pageNum, pageSize);
+                                                         Integer apiId,
+                                                         String con) {
+        return wmsFeign.getWmspIntransitInventory(mapVal == null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
     }
 
     //新增倒库出库实绩
@@ -273,13 +274,6 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
 
-//    //修改倒垛单
-//    @PostMapping("/addRestackMakeResult")
-//    public Map<String, Object> addRestackMakeResult(@RequestBody(required = false) List<Map<String, Object>> mapVal) {
-//        Map<String, Object> resTfulResult = wmsFeign.addRestackMakeResult(mapVal);
-//        return  resTfulResult;
-//    }
-
     @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
         Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
@@ -314,6 +308,8 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
         return resTfulResult;
     }
+
+
    @ApiImplicitParams({
            @ApiImplicitParam(value = "395",name = "apiId")
    })
@@ -365,8 +361,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
-                                             Integer pageSize) {
-        return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
+                                             Integer pageSize,
+                                             String con) {
+        return wmsFeign.getWmsReboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/selectScanResultByIboundResultId")
@@ -374,30 +371,31 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult selectScanResultByIboundResultId( Map<String, Object> mapValue,
-                                                           Integer apiId,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer inboundId) {
+    public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer inboundId
+    ) {
 
         return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
     }
-   //根据物资信息获取原来垛位信息
-   @PostMapping("/selectInfoByMaterialCode")
-   public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+    //根据物资信息获取原来垛位信息
+    @PostMapping("/selectInfoByMaterialCode")
+    public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
         if (mal == null) {
             mal = new HashMap<>();
         }
-       return  wmsFeign.selectInfoByMaterialCode(mal);
-   }
-   //根据仓库查询未接收的垛位
-   @PostMapping("/selectStackingInfoByWarehouseId")
-   public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
-       if (mal == null) {
-           mal = new HashMap<>();
-       }
-       return  wmsFeign.selectStackingInfoByWarehouseId(mal);
-   }
+        return  wmsFeign.selectInfoByMaterialCode(mal);
+    }
+    //根据仓库查询未接收的垛位
+    @PostMapping("/selectStackingInfoByWarehouseId")
+    public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+        return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+    }
 
     @PostMapping("/getWmsIvboundResult")
     @ApiOperation(value = "展示倒库实绩信息")
@@ -441,8 +439,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize) {
-        return wmsFeign.getInventoryCheck(mapValue, apiId, pageNum, pageSize);
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryCheck(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/getInventoryClose")
@@ -453,8 +452,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize) {
-        return wmsFeign.getInventoryClose(mapValue, apiId, pageNum, pageSize);
+                                           Integer pageSize,
+                                           String  con) {
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @PostMapping("/getSendReceive")
@@ -465,8 +465,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getSendReceive(Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
-                                        Integer pageSize) {
-        return wmsFeign.getSendReceive(mapValue, apiId, pageNum, pageSize);
+                                        Integer pageSize,
+                                        String con) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     /**
@@ -556,21 +557,6 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("/insertInboundResult")
     @Transactional
     public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
-        /*
-        获取入库物资件数
-         */
-        int size = mapList.size();
-        /*
-        获取入库垛位
-         */
-//        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
-//        String stackNo = (String) map1.get("stackNo");
-//        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
-//        for (Map<String, Object> map : mapList
-//        ) {
-//            map.put("stackingId", stackId);
-//        }
-
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -708,16 +694,6 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.updateInstruction(map);
     }
 
-//    @PostMapping("/selectScanResultByIboundResultId")
-//    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
-//    })
-//    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
-//                                                          Integer apiId,
-//                                                          Integer pageNum,
-//                                                          Integer pageSize) {
-//        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
 //    }
 
     @PostMapping("/getIvboundMakeResultList")
@@ -728,8 +704,9 @@ public class WMSController extends BaseRESTfulController {
     public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
-                                                  Integer apiId,
-                                                  String con) {
+                                                          Integer apiId,
+                                                          String con) {
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }

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

@@ -352,5 +352,20 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运单id查询实绩位置")
     @PostMapping("api/v1/oms/omstruckorders/addInputOrder")
     Map<String, Object> addInputOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOthersOrderMesToSend")
+    Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("orderStatus") Integer orderStatus,
+                                                       @RequestParam("carrierId") Integer carrierId,
+                                                       @RequestParam("type") Integer type,
+                                                       @RequestParam("con") String con
+                                                       );
+
+    @ApiOperation(value = "根据运输订单id修改运力id")
+    @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
+    Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
 }
 

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

@@ -116,6 +116,8 @@ public interface RmsFeign {
                                        @RequestParam("pageNum") Integer pageNum,
                                        @RequestParam("pageSize") Integer pageSize,
                                        @RequestParam String con);
+
+
     //新增物资
     @PostMapping(value = "api/v1/rms/rmsmaterial/insertMaterial")
     Map<String, Object> insertMaterial(@RequestBody(required = false) Map<String, Object> map);
@@ -213,14 +215,16 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
     Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
 
-
-    ;
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
+
+    //新增汽车衡下的物资
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculateOfMaterial")
+    Map<String, Object> insertTruckCalculateOfMaterial(@RequestBody(required = false) Map<String, Object> map);
     //更新汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/updateTruckCalculate")
-    Map<String, Object> updateTruckCalculate(Map<String, Object> map);
+    Map<String, Object> updateTruckCalculate(@RequestBody Map<String, Object> map);
     //根据id查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateById/{id}")
 
@@ -230,6 +234,10 @@ public interface RmsFeign {
     //根据id删除汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
+
+    //根据id删除汽车衡与物资中间表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculateMaterial/{id}")
+    Map<String, Object> deleteTruckCalculateMaterial(@PathVariable("id") BigDecimal id);
     //模糊查询汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
     Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -237,6 +245,13 @@ public interface RmsFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
                                               @RequestParam String con);
+    //汽车衡物资展示表
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getCalculateOfMaterialList")
+    Map<String, Object> getCalculateOfMaterialList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam BigDecimal truckCalculateId);
 
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")
@@ -314,6 +329,16 @@ public interface RmsFeign {
                                              @RequestParam("pageSize") Integer pageSize,
                                              @RequestParam String con);
 
+    //    根据规则Id删除规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/deleteGatepostRules/{rulesId}")
+    Map<String, Object> deleteGatepostRules(@RequestParam("rulesId") BigDecimal rulesId);
+    //    新增门岗规则
+    @PostMapping(value ="api/v1/rms/rmsgatepost/insertGatepostRule")
+    Map<String, Object> insertGatepostRule(@RequestBody(required = false) Map<String, Object> mapValue);
+    //    根据门岗id获取门岗名
+    @PostMapping(value ="api/v1/rms/rmsgatepost/getGatepostName/{gatepostId}")
+    Map<String,Object> getGatepostName(@PathVariable("gatepostId")BigDecimal gatepostId);
+
     //获取物资种类
     @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
     Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -365,4 +390,38 @@ public interface RmsFeign {
     //    根据id下拉框获取车辆类型
     @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
     Map<String,Object> getVehicleTypeId();
+
+
+
+    @PostMapping(value = "/api/v1/rms/dilnotices/getNoticeList")
+    Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+    //新增公告
+    @PostMapping(value = "api/v1/rms/dilnotices/insertNotice")
+    Map<String,Object> insertNotice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除公告
+    @PostMapping(value = "api/v1/rms/dilnotices/deleteNotice/{id}")
+    Map<String, Object> deleteNotice(@PathVariable("id") BigDecimal id);
+
+    //更新公告
+    @PostMapping(value = "api/v1/rms/dilnotices/updateNotice")
+    Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取公告
+    @PostMapping(value = "api/v1/rms/dilnotices/getNoticeById/{id}")
+    Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
+
+
+//******************************************下拉框*******************************
+
+
+    //公告下拉框,须摸清实现原理
+    @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
+    Map<String,Object> getNoticeTypeId();
+
+
 }

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

@@ -252,4 +252,5 @@ public interface TmsTrainFeign {
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -339,6 +339,13 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
     Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
 
+    @PostMapping("api/v1/truckTms/statisticalReport/getRLFLReport")
+    Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("orderType") Integer orderType
+    );
 }
 
 

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

@@ -159,11 +159,23 @@ public interface TmsshipFeign {
      * 展示位置作业信息列表
      *
      * @param mapValue
+<<<<<<< HEAD
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
     Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue);
 
+
     /**
      * 查询位置作业信息
      *
@@ -429,7 +441,8 @@ public interface TmsshipFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
                                               @RequestParam Integer apiId,
-                                                    @RequestParam String con);
+                                                    @RequestParam String con,
+                                                    @RequestParam String status);
 
     /**
      * 查询装船指令
@@ -446,8 +459,8 @@ public interface TmsshipFeign {
      * @param shipmentInstructionsId
      * @return
      */
-    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateIssueStatus/{shipmentInstructionsId}")
-    Map<String, Object> updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/sendShipmentInstructionsStatus/{shipmentInstructionsId}")
+    Map<String, Object> sendShipmentInstructionsStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
 
     /**
      * 删除装船指令
@@ -744,4 +757,15 @@ public interface TmsshipFeign {
     @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
     Map<String, Object> selectAll();
 
+
+    //获取合同水分值，实装吨位，水分吨位
+    @PostMapping("api/v1/shipTms/tmsshipwaterqualityresults/getMoistureAndInstallations")
+    Map<String,Object> getMoistureAndInstallations(Map<String,Object> map);
+
+    //    模糊查询江船名
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
+    Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
+
+
+
 }

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

@@ -28,7 +28,8 @@ public interface WMSFeign {
     Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
 
     /**
      * 展示出库实绩
@@ -148,9 +149,9 @@ public interface WMSFeign {
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
     Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
-                                                       @RequestParam Integer apiId,
-                                                       @RequestParam Integer pageNum,
-                                                       @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
                                                       @RequestParam String con);
 
     /**
@@ -169,10 +170,12 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
-    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)
+    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)Map<String,Object>mapval,
                                                      @RequestParam Integer apiId,
                                                      @RequestParam Integer pageNum,
-                                                     @RequestParam Integer pageSize);
+                                                     @RequestParam Integer pageSize,
+                                                     @RequestParam String con);
+
 
 
     /**
@@ -209,7 +212,7 @@ public interface WMSFeign {
                                                     @RequestParam Integer warehouseid,
                                                     @RequestParam Integer stackingId,
                                                     @RequestParam Integer gradtionNumber
-                                                   );
+    );
 
     /**
      *    添加倒垛单实绩
@@ -221,7 +224,7 @@ public interface WMSFeign {
 
 
     @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
-     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+    Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
 
 
 
@@ -274,42 +277,42 @@ public interface WMSFeign {
      * @param DistrubtionStatus
      * @return
      */
-   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-   Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
-                                                   @RequestParam Integer apiId,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer DistrubtionStatus
-                                                  );
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
+    Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize,
+                                                    @RequestParam Integer DistrubtionStatus
+    );
     /**
      *  修改倒垛单
      * @param mapval
      * @return
      */
-   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
-   Map<String,Object> editRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
+    Map<String,Object> editRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
     /**
      *   渲染倒垛后的仓库信息
      * @param resultId
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
-  Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
+    Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
     /**
      *  渲染倒垛后的垛位信息
      * @param resultId
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
-  Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
+    Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
 
     /**
      * PDA展示倒垛单
      * @param map
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
-  Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
+    Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
 
 
 
@@ -326,8 +329,8 @@ public interface WMSFeign {
      * @param map
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
-  Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
+    Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
     /**
      * PDA根据仓库id查找倒垛单
      * @param map
@@ -340,12 +343,12 @@ public interface WMSFeign {
      * @param mal
      * @return
      */
+
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
 
 
 
-
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
     Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
     /**
@@ -353,8 +356,8 @@ public interface WMSFeign {
      * @param mapList
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
-  Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
+    Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
     /**
      * 展示退库实绩
      * @param mapValue
@@ -367,7 +370,8 @@ public interface WMSFeign {
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
 
 
     @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
@@ -375,7 +379,9 @@ public interface WMSFeign {
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
-                                                   @RequestParam Integer inboundId);
+                                                   @RequestParam Integer inboundId
+                                                   );
+
     //根据物资信息查找暂存的垛位
     @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
     Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
@@ -425,7 +431,8 @@ public interface WMSFeign {
     RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
 
 
     /**
@@ -440,7 +447,8 @@ public interface WMSFeign {
     RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
-                                    @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
 
     /**
      * 收发存报表
@@ -449,7 +457,8 @@ public interface WMSFeign {
     RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize);
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam String con);
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilVersion;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilVersionMapper extends IBaseMapper<DilVersion, BigDecimal> {
+
+    //查询最大主键
+    @Select("select max(DV.VERSION_ID) + 1 from DIL_VERSION")
+    BigDecimal selectMaxId();
+
+    //查询最新的版本号
+    String compareVersion();
+
+    //查询版本号是否已存在
+    Integer getVersionId(String version);
+}

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.mapper;
 
 import org.mapstruct.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -28,9 +29,12 @@ public interface UniversalMapper {
     //模糊查询承运商的运力信息
     List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
 
-    //通过运输订单ID查询物资子表（针对钢材）
+    //通过运输订单ID查询物资子表（针对多拼）
     List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
 
+    //通过订单ID查询订单下所有物资
+    List<Map<String, Object>> getOrderMaterialMesByOrderId(BigDecimal orderId);
+
     //通过物资ID查询该物资的发货单位信息
     List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/model/DilVersion.java

@@ -0,0 +1,138 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="app版本号")
+public class DilVersion implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(VERSION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal versionId;
+
+    /**
+     * 版本号(VERSION_VALUE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="版本号",required=false)
+    private String versionValue;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.versionId;
+    }
+
+    @Override
+    public void setId(BigDecimal versionId) {
+        this.versionId = versionId;
+    }
+
+    public BigDecimal getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(BigDecimal versionId) {
+        this.versionId = versionId;
+    }
+
+    public String getVersionValue() {
+        return versionValue;
+    }
+
+    public void setVersionValue(String versionValue) {
+        this.versionValue = versionValue == null ? null : versionValue.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", versionId=").append(versionId);
+        sb.append(", versionValue=").append(versionValue);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.DilVersion;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.math.BigDecimal;
+
+/**
+ * DilVersion服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-14 10:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-14
+ * 作者：generator
+ * 参考：
+ * 描述：DilVersion服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDilVersionService{
+
+    int compareAppVersion(String version);
+
+    String addAppVersion(String version);
+
+}

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

@@ -0,0 +1,68 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.DilVersionMapper;
+import com.steerinfo.dil.model.DilVersion;
+import com.steerinfo.dil.service.IDilVersionService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * DilVersion服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-14 10:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-14
+ * 作者：generator
+ * 参考：
+ * 描述：DilVersion服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dilVersionService")
+public class DilVersionServiceImpl implements IDilVersionService {
+
+    @Autowired
+    private DilVersionMapper dilVersionMapper;
+
+
+    /**
+     * 传入版本号查询是否为最新版本
+     * @param version 版本号
+     * @return 0 不需要更新  1 需要更新
+     */
+    public int compareAppVersion(String version){
+        //查找当前最新版本号
+        String theLastVersion = dilVersionMapper.compareVersion();
+        //判断是否为最新版本号
+        if(theLastVersion.equals(version)){
+            return 0;
+        }
+        return 1;
+    }
+
+    /**
+     * 添加APP版本号
+     * @param version
+     * @return
+     */
+    public String addAppVersion(String version){
+        //判断该版本号是否已存在
+        Integer versionId = dilVersionMapper.getVersionId(version);
+        if(versionId != null){
+            return "版本号已存在";
+        }
+        DilVersion dilVersion = new DilVersion();
+        dilVersion.setVersionId(dilVersionMapper.selectMaxId());
+        dilVersion.setVersionValue(version);
+        dilVersion.setInsertTime(new Date());
+        dilVersion.setInsertUsername("admin");
+        dilVersionMapper.insertSelective(dilVersion);
+        return version + "添加成功";
+    }
+}

src/main/resources/bootstrap.yml

@@ -3,9 +3,9 @@ spring:
   profiles:
     include: ${SPRING_PROFILES:dev}
   jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
-#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  #    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
   messages:
     basename: message
     encoding: UTF-8
@@ -24,36 +24,66 @@ eureka:
 
 
 openfeign:
+#  #正式环境
+#    ColumnDataFeign:
+#      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+#    AmsFeign:
+#      url: ${AMSFEIGN_URL:localhost:8079}
+#    BmsshipFeign:
+#      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+#    BmstrainFeign:
+#      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+#    BmstruckFeign:
+#      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+#    QmsTruckFeign:
+#      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+#    TmsTrainFeign:
+#      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+#    TmsTruckFeign:
+#      url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+#    TmsshipFeign:
+#      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+#    WMSHFeign:
+#      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+#    WMSFeign:
+#      url: ${WMSFEIGN_URL:172.16.33.166:8093}
+#    OMSFeign:
+#      url: ${OMSFEIGN_URL:localhost:8095}
+#    RmsFeign:
+#      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+
+  #测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
 cache:
+
   level: 2
 redis:
   host: 10.10.50.28
@@ -79,5 +109,4 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8080
-
+  port: 8080

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

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.DilVersionMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilVersion">
+    <id column="VERSION_ID" jdbcType="DECIMAL" property="versionId" />
+    <result column="VERSION_VALUE" jdbcType="VARCHAR" property="versionValue" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    VERSION_ID, VERSION_VALUE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.VERSION_ID, t.VERSION_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM DIL_VERSION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_VERSION t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="versionId != null">
+        and VERSION_ID = #{versionId}
+      </if>
+      <if test="versionValue != null and versionValue != ''">
+        and VERSION_VALUE = #{versionValue}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="versionId != null">
+        and VERSION_ID = #{versionId}
+      </if>
+      <if test="versionValue != null and versionValue != ''">
+        and VERSION_VALUE LIKE '%${versionValue}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from DIL_VERSION
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_VERSION
+    where 1!=1 
+      <if test="versionValue != null and versionValue != ''">
+        or VERSION_VALUE = #{versionValue}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.DilVersion">
+    insert into DIL_VERSION (VERSION_ID, VERSION_VALUE, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{versionId,jdbcType=DECIMAL}, #{versionValue,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.DilVersion">
+    insert into DIL_VERSION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        VERSION_ID,
+      </if>
+      <if test="versionValue != null">
+        VERSION_VALUE,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="versionId != null">
+        #{versionId,jdbcType=DECIMAL},
+      </if>
+      <if test="versionValue != null">
+        #{versionValue,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.DilVersion">
+    update DIL_VERSION
+    set VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilVersion">
+    update DIL_VERSION
+    <set>
+      <if test="versionValue != null">
+        VERSION_VALUE = #{versionValue,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where VERSION_ID = #{versionId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into DIL_VERSION 
+      (VERSION_ID, 
+      VERSION_VALUE, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.versionId,jdbcType=DECIMAL}, 
+      #{item.versionValue,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update DIL_VERSION
+     set
+       VERSION_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionId,jdbcType=DECIMAL}
+       </foreach>
+       ,VERSION_VALUE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.versionValue,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case VERSION_ID" close="end">
+          when #{item.versionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where VERSION_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.versionId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_VERSION
+    where VERSION_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+  <select id="compareVersion" resultType="string">
+    select *
+    from (
+           select DV.VERSION_VALUE
+           from DIL_VERSION DV
+           order by DV.VERSION_ID desc
+         )
+    where ROWNUM = 1
+  </select>
+
+
+  <select id="getVersionId" parameterType="string" resultType="java.lang.Integer">
+    select DV.VERSION_ID from DIL_VERSION DV
+    where DV.VERSION_VALUE = #{versionValue}
+  </select>
+
+</mapper>

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

@@ -66,9 +66,9 @@
                     RM.MATERIAL_SPECIFICATION "materialSpecification",
                     RM.MATERIAL_MODEL "materialModel"
                 FROM AMS_PURCHASE_ORDER APO
-                    LEFT JOIN DIL_BATCH DB
+                    JOIN DIL_BATCH DB
                         ON DB.BATCH_ID = APO.BATCH_ID
-                    LEFT JOIN RMS_MATERIAL RM
+                    JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
@@ -150,15 +150,12 @@
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
                  FROM RMS_CAPACITY RC
-                          LEFT JOIN RMS_CARRIER RCA
-                                    ON RCA.CARRIER_ID = RC.CARRIER_ID
+                          JOIN RMS_CARRIER RCA
+                                ON RCA.CARRIER_ID = RC.CARRIER_ID
                  WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
                    <if test="index != null">
                        and RCA.CARRIER_NAME LIKE #{index}
                    </if>
-                   <if test="index == null">
-                       and rownum &lt; 21
-                   </if>
              )
     </select>
 
@@ -448,4 +445,19 @@
             </foreach>
         </if>
     </select>
+
+<!--  通过订单ID查询订单下所有物资  -->
+    <select id="getOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select RM.MATERIAL_NAME     "materialName",
+               CONCAT(RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL)     "materialModel",
+               (case
+                   when OOM.ORDER_MATERIAL_WEIGHT is not null
+                        then OOM.ORDER_MATERIAL_WEIGHT
+                   else OOM.ORDER_MATERIAL_NUMBER
+               end) "weightNum"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+            left join RMS_MATERIAL  RM
+            on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>