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

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

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -105,6 +107,13 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.deletePortHandlingFee(feeId);
     }
 
+
+    @PostMapping("deletePortHandlingFeeSecond/{feeId}")
+    @ApiOperation(value = "逻辑删除二程港口装卸费")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId") BigDecimal feeId) {
+        return bmsshipFeign.deletePortHandlingFeeSecond(feeId);
+    }
+
     @PostMapping("getUncomplateDetailsOrderList")
     @ApiOperation(value = "展示未生成账单的详单信息")
     public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -549,6 +558,19 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.update(statementId);
     }
 
+
+    /**
+     * 审批计费账单
+     */
+    @PostMapping("/getBmsshipFee/{id}")
+    public Map<String,Object> updateConvertedTruckStatement(@PathVariable("id") Integer id) {
+        return bmsshipFeign.getBmsshipFee(id);
+    }
+
+
+
+
+
     @PostMapping("/updateDetailsOrder")
     @ApiOperation(value = "修改详单")
     public RESTfulResult updateDetailsOrder(@RequestBody Map<String, Object> mapValue) {
@@ -561,6 +583,35 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.addLossFeeOfCoke(map);
     }
 
+
+
+
+
+    @PostMapping("/addPortHandlingFeeSecond")
+    @ApiOperation(value = "新增二程船装卸费用")
+    public Map<String,Object> addPortHandlingFeeSecond(@RequestBody(required = false) Map<String, Object> map) {
+        return bmsshipFeign.addPortHandlingFeeSecond(map);
+    }
+
+
+    @PostMapping("/uploadBmsshipOrder")
+    @ApiOperation(value = "上传水运单图片")
+    public Map<String,Object> uploadBmsshipOrder(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        return bmsshipFeign.uploadBmsshipOrder(multipartFile);
+    }
+
+
+    //获取水运单图片
+    @ApiOperation(value = "获取水运单图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downloadBmsshipOrder")
+    public Map<String, Object> downloadBmsshipOrder(@RequestParam Integer resultId) {
+        return bmsshipFeign.downloadBmsshipOrder(resultId);
+    }
+
+
+
     /**
      * 展示详单信息
      *
@@ -587,12 +638,16 @@ public class BMSController extends BaseRESTfulController {
                                                            Integer orderType,
                                                            String userId,
                                                            String startTime,
-                                                           String endTime) {
+                                                           String endTime,
+                                                           String capacityNo,
+                                                           String shipperNames,
+                                                           String transRangeValues,
+                                                           String materialTypeNames) {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
         return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
-                 endTime);
+                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames);
     }
 
     @PostMapping("/getNoInwardDetails")
@@ -629,6 +684,20 @@ public class BMSController extends BaseRESTfulController {
                 endTime);
     }
 
+    @PostMapping("/selectPortFeeSecondList")
+    public Map<String,Object> selectPortFeeSecondList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 String startTime,
+                                                 String endTime,
+                                                      Integer feeType){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmsshipFeign.selectPortFeeSecondList(mapVal, pageNum, pageSize, apiId, startTime, feeType,endTime);
+    }
+
 
 
 

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

@@ -67,4 +67,15 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     public RESTfulResult allowEnfactory(String orderNumber){
         return success(backgroundProcessingMapper.allowEnfactory(orderNumber));
     }
+
+    @ApiOperation(value = "获取cid和车牌号的关系")
+    @PostMapping("/bindCidCapacityNo")
+    public RESTfulResult bindCidCapacityNo(String cid,
+                                           String capacityNo){
+        if(cid == null || capacityNo == null || "null".equals(cid) || "null".equals(capacityNo)){
+            return success(0);
+        }
+        int i = backgroundProcessingService.bindCidCapacityNo(cid,capacityNo);
+        return success(i);
+    }
 }

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

@@ -1187,4 +1187,54 @@ public class RMScontroller {
         return rmsFeign.getPierName(index);
     }
 
+
+    @ApiOperation(value="获取船运合同管理列表")
+    @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("/selectbmsshipContractPriceList")
+    public Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                              Integer apiId,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              String con,
+                                                              String startTime,
+                                                              String endTime
+    ){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return   rmsFeign.selectbmsshipContractPriceList(mapValue, apiId, pageNum, pageSize, con, startTime, endTime);
+    }
+
+
+    //新增船运合同管理
+    @PostMapping(value = "/insertBmsshipContractPrice")
+    public Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/updateBmsshipContractPrice")
+    public Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/deleteBmsshipContractPrice")
+    public Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteBmsshipContractPrice(map);
+    }
+
+    //修改船运合同管理
+    @PostMapping(value = "/selectBmsshipPriceList/{id}")
+    public Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id){
+        return rmsFeign.selectBmsshipPriceList(id);
+    }
+
 }

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

@@ -120,11 +120,13 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                Integer apiId,
                                                Integer status,
-                                               @RequestParam(required = false) String con) {
+                                               @RequestParam(required = false) String con,
+                                               String startTime,
+                                               String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
+        return tmsshipFeign.getLoadShipList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con,startTime,endTime);
     }
 
     @PostMapping("getLoadShip/{resultId}")
@@ -1626,6 +1628,34 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize,con);
     }
 
+
+
+
+    @ApiOperation(value = "查询进口矿未绑定装车实绩的车皮")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(203)", 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("/getResultType")
+    public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                                                        Integer apiId,
+                                                                Integer pageNum,
+                                                                Integer pageSize,
+                                                                String con
+    ) {
+        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId, pageNum, pageSize,con);
+    }
+
+    @PostMapping("/addShipLoadResult")
+    @ApiOperation(value = "江港-达州新增装车")
+    public Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.addShipLoadResult(map);
+    }
+
+
     @PostMapping("/addWagonPleaseForNZ")
     @ApiOperation(value = "内转物流新增请车")
     public Map<String, Object> addPleaseForNZ(@RequestBody(required = false) Map<String, Object> tmstrainLoadingResult) {

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

@@ -399,6 +399,37 @@ 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("/selectPurchaseOrderForShip")
+    public RESTfulResult selectPurchaseOrderForShip(@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.selectPurchaseOrderForShip(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+
+
+
+
+
     @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {

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

@@ -1028,5 +1028,18 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> disorderlyOutbound(@RequestBody Map<String,Object> map){
         return wmsFeign.disorderlyOutbound(map);
     }
+
+
+    @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/gePortStockList")
+    public Map<String,Object> gePortStockList(@RequestBody(required = false) Map<String,Object> mapVal
+    ){
+        return wmsFeign.gePortStockList(mapVal);
+    }
 }
 

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

@@ -2,7 +2,9 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -264,4 +266,30 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getWaterFeesFormula")
     RESTfulResult getWaterFeesFormula();
+
+     //新增二程船装卸费用
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFeeSecond")
+    Map<String, Object> addPortHandlingFeeSecond(@RequestBody(required = true) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/uploadBmsshipOrder", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    Map<String, Object> uploadBmsshipOrder(@RequestPart("file") MultipartFile multipartFile);
+
+    //下载水运单图片
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/downloadBmsshipOrder")
+    Map<String, Object> downloadBmsshipOrder(@RequestParam("resultId") Integer resultId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/selectPortFeeSecondList")
+    Map<String, Object> selectPortFeeSecondList(@RequestBody(required = false)Map<String, Object> mapVal,
+                                                @RequestParam("pageNum")Integer pageNum,
+                                                @RequestParam("pageSize")Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("startTime") String startTime,
+                                                @RequestParam("feeType")Integer feeType,
+                                                @RequestParam("endTime") String endTime);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBmsshipFee/{id}")
+    Map<String, Object> getBmsshipFee(@PathVariable("id") Integer id);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFeeSecond/{feeId}")
+    Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId")BigDecimal feeId);
 }

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

@@ -244,7 +244,11 @@ public interface BmstruckFeign {
                                                     @RequestParam("orderType") Integer orderType,
                                                     @RequestParam("userId") String userId,
                                                     @RequestParam("startTime")String startTime,
-                                                    @RequestParam("endTime")String endTime);
+                                                    @RequestParam("endTime")String endTime,
+                                                    @RequestParam("capacityNo")String capacityNo,
+                                                    @RequestParam("shipperNames")String shipperNames,
+                                                    @RequestParam("transRangeValues")String transRangeValues,
+                                                    @RequestParam("materialTypeNames")String materialTypeNames);
 
 
 
@@ -269,6 +273,9 @@ public interface BmstruckFeign {
                                            @RequestParam("userId") String userId,
                                            @RequestParam("startTime") String startTime,
                                            @RequestParam("endTime") String endTime);
+
+
+
 }
 
 

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

@@ -648,4 +648,27 @@ public interface RmsFeign {
     // 边输边查码头名称
     @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
     Map<String, Object> getPierName(@RequestParam("index") String index);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectbmsshipContractPriceList")
+    Map<String, Object> selectbmsshipContractPriceList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam("startTime") String startTime,
+                                                       @RequestParam("endTime")String endTime);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/insertBmsshipContractPrice")
+    Map<String, Object> insertBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/updateBmsshipContractPrice")
+    Map<String, Object> updateBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 删除船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/deleteBmsshipContractPrice")
+    Map<String, Object> deleteBmsshipContractPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    // 渲染船运合同单价
+    @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectBmsshipPriceList/{id}")
+    Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id);
 }

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

@@ -293,4 +293,15 @@ public interface TmsTrainFeign {
 
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/updateWarehouseResult")
     Map<String, Object> updateWarehouseResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
+    Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+
+    @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")
+    Map<String, Object> addShipLoadResult(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -108,11 +108,13 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
     Map<String, Object> getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                  @RequestParam Integer pageNum,
-                                  @RequestParam Integer pageSize,
-                                  @RequestParam Integer apiId,
-                                        @RequestParam Integer status,
-                                        @RequestParam(required = false) String con);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status,
+                                        @RequestParam(required = false) String con,
+                                        @RequestParam("startTime") String startTime,
+                                        @RequestParam("endTime") String endTime);
 
     /**
      * 查询装船作业表单

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

@@ -882,4 +882,7 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/wmspoutboundresults/disorderlyOutbound")
     Map<String, Object> disorderlyOutbound(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/wmshgridmaterials/gePortStockList")
+    Map<String, Object> gePortStockList(@RequestBody(required = false) Map<String, Object> mapVal);
 }

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

@@ -0,0 +1,14 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilCidCapacity;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface DilCidCapacityMapper extends IBaseMapper<DilCidCapacity, BigDecimal> {
+
+    @Select("select seq_dil_cid_capacityNo.nextval from dual")
+    BigDecimal getCidMax();
+}

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

@@ -181,6 +181,7 @@ public interface UniversalMapper {
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 
     List<Map<String,Object>> getXiNanCarrier();
+
     //边输边查发站到站
     List<Map<String, Object>> getArrivalByLike(String index);
 
@@ -229,4 +230,6 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getInwardWeightMaterial(Map<String, Object> mapValue);
 
+    List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
+
 }

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

@@ -0,0 +1,153 @@
+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="运力与cid的关系表")
+public class DilCidCapacity implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(CID_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal cidCapacityId;
+
+    /**
+     * 用户cid(CID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="用户cid",required=false)
+    private String cid;
+
+    /**
+     * 车牌号(CAPACITY_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="车牌号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 记录创建人(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.cidCapacityId;
+    }
+
+    @Override
+    public void setId(BigDecimal cidCapacityId) {
+        this.cidCapacityId = cidCapacityId;
+    }
+
+    public BigDecimal getCidCapacityId() {
+        return cidCapacityId;
+    }
+
+    public void setCidCapacityId(BigDecimal cidCapacityId) {
+        this.cidCapacityId = cidCapacityId;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setCid(String cid) {
+        this.cid = cid == null ? null : cid.trim();
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.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(", cidCapacityId=").append(cidCapacityId);
+        sb.append(", cid=").append(cid);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        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/IBackgroundProcessService.java

@@ -6,4 +6,5 @@ public interface IBackgroundProcessService {
 
     int updatePurOrgId(Map<String, Object> map);
 
+    int bindCidCapacityNo(String cid, String capacityNo);
 }

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

@@ -1,16 +1,15 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.mapper.DilCidCapacityMapper;
+import com.steerinfo.dil.model.DilCidCapacity;
 import com.steerinfo.dil.service.IBackgroundProcessService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service(value = "backgroundProcessingService")
 public class BackgroundProcessingServiceImpl implements IBackgroundProcessService {
@@ -18,6 +17,9 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
     @Autowired
     private BackgroundProcessingMapper backgroundProcessingMapper;
 
+    @Autowired
+    private DilCidCapacityMapper dilCidCapacityMapper;
+
 
     /**
      * 更新订单所属厂区
@@ -112,4 +114,15 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
                 backgroundProcessingMapper.deleteOutFactoryUnnecessaryResult(resultList);
         }
     }
+
+    @Override
+    public int bindCidCapacityNo(String cid, String capacityNo) {
+        DilCidCapacity dilCidCapacity = new DilCidCapacity();
+        dilCidCapacity.setCidCapacityId(dilCidCapacityMapper.getCidMax());
+        dilCidCapacity.setCid(cid);
+        dilCidCapacity.setCapacityNumber(capacityNo);
+        dilCidCapacity.setInsertTime(new Date());
+        int i = dilCidCapacityMapper.insertSelective(dilCidCapacity);
+        return i;
+    }
 }

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  #path: C:\Users\24390\Desktop\work\a
-  path: /shared
+  path: C:\Users\24390\Desktop\work\a
+#  path: /shared
 server:
   port: 8080

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

@@ -0,0 +1,292 @@
+<?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.DilCidCapacityMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilCidCapacity">
+    <id column="CID_CAPACITY_ID" jdbcType="DECIMAL" property="cidCapacityId" />
+    <result column="CID" jdbcType="VARCHAR" property="cid" />
+    <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
+    <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">
+    CID_CAPACITY_ID, CID, CAPACITY_NUMBER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.CID_CAPACITY_ID, t.CID, t.CAPACITY_NUMBER, 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_CID_CAPACITY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM DIL_CID_CAPACITY t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="cidCapacityId != null">
+        and CID_CAPACITY_ID = #{cidCapacityId}
+      </if>
+      <if test="cid != null and cid != ''">
+        and CID = #{cid}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER = #{capacityNumber}
+      </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="cidCapacityId != null">
+        and CID_CAPACITY_ID = #{cidCapacityId}
+      </if>
+      <if test="cid != null and cid != ''">
+        and CID LIKE '%${cid}%'
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
+      </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_CID_CAPACITY
+    where CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_CID_CAPACITY
+    where 1!=1 
+      <if test="cid != null and cid != ''">
+        or CID = #{cid}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        or CAPACITY_NUMBER = #{capacityNumber}
+      </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.DilCidCapacity">
+    insert into DIL_CID_CAPACITY (CID_CAPACITY_ID, CID, CAPACITY_NUMBER, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{cidCapacityId,jdbcType=DECIMAL}, #{cid,jdbcType=VARCHAR}, #{capacityNumber,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.DilCidCapacity">
+    insert into DIL_CID_CAPACITY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="cidCapacityId != null">
+        CID_CAPACITY_ID,
+      </if>
+      <if test="cid != null">
+        CID,
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER,
+      </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="cidCapacityId != null">
+        #{cidCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        #{capacityNumber,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.DilCidCapacity">
+    update DIL_CID_CAPACITY
+    set CID = #{cid,jdbcType=VARCHAR},
+      CAPACITY_NUMBER = #{capacityNumber,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 CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilCidCapacity">
+    update DIL_CID_CAPACITY
+    <set>
+      <if test="cid != null">
+        CID = #{cid,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER = #{capacityNumber,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 CID_CAPACITY_ID = #{cidCapacityId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CID_CAPACITY_ID = #{cidCapacityId,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_CID_CAPACITY 
+      (CID_CAPACITY_ID, 
+      CID, CAPACITY_NUMBER, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.cidCapacityId,jdbcType=DECIMAL}, 
+      #{item.cid,jdbcType=VARCHAR}, #{item.capacityNumber,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_CID_CAPACITY
+     set
+       CID_CAPACITY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cidCapacityId,jdbcType=DECIMAL}
+       </foreach>
+       ,CID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.cid,jdbcType=VARCHAR}
+       </foreach>
+       ,CAPACITY_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CID_CAPACITY_ID" close="end">
+          when #{item.cidCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where CID_CAPACITY_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.cidCapacityId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_CID_CAPACITY
+    where CID_CAPACITY_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

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

@@ -393,6 +393,7 @@
             order by "materialId" desc
         </if>
     </select>
+
 <!--  查询所有的批次及其关联的采购订单号  -->
     <select id="getBatchAndOrderMes" parameterType="map" resultType="java.util.Map">
         select *
@@ -402,7 +403,8 @@
                         DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
                         RM.MATERIAL_NAME            "materialName",
                         APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-                        APO.INSERT_TIME             "insetTime"
+                        APO.INSERT_TIME             "insetTime",
+                        APO.PURCHASE_ORDER_ID        "purchaseOrderId"
                  from DIL_BATCH DB
                           left join AMS_PURCHASE_ORDER APO
                                     on APO.BATCH_ID = DB.BATCH_ID
@@ -954,11 +956,14 @@
         WHERE RCA.CARRIER_NAME LIKE '%西南水泥%'
     </select>
 
+    <!-- 边输边查发站-->
     <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT RAS.ARRIVAL_NAME AS "arrivalName",
                RAS.ARRIVAL_ID AS "arrivalId"
         FROM RMSTRAIN_ARRIVAL_SEND RAS
-        WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+        <if test="index!=null and index != ''.toString()">
+            WHERE instr(RAS.ARRIVAL_NAME,#{index}) > 0
+        </if>
     </select>
 
     <select id="getOrderNum" parameterType="string" resultType="java.lang.Integer">
@@ -1164,6 +1169,28 @@
           ORDER BY OO.ORDER_ID DESC
     </select>
 
+
+<!-- 查询进口矿得采购订单-->
+    <select id="selectPurchaseOrderForShip" resultType="java.util.Map" parameterType="java.util.Map">
+        select
+            DB.BATCH_ID                 "batchId",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            RM.MATERIAL_NAME            "materialName",
+            APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+            APO.INSERT_TIME             "insetTime",
+            APO.PURCHASE_ORDER_ID        "purchaseOrderId"
+        from AMS_PURCHASE_ORDER APO
+                 left join DIL_BATCH DB
+                           on APO.BATCH_ID = DB.BATCH_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = DB.MATERIAL_ID
+        WHERE    DB.RESULT_FOREIGN_SHIP_NAME IS NOT NULL
+                 <if test="index!=null">
+                     and (INSTR(DB.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(RM.MATERIAL_NAME,#{index}) > 0)
+                 </if>
+    </select>
+
+
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 7
@@ -1182,4 +1209,5 @@
         AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
         )
     </update>
+
 </mapper>