修改

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

@@ -1985,4 +1985,27 @@ public class AMScontroller{
     ) {
         return amsFeign.getSaleCokeOrder(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,shipperId,startTime,endTime);
     }
+
+    @ApiModelProperty(value = "反关闭金蝶单个分录")
+    @PostMapping("/adverseCloseSaleMaterial")
+    public Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId) {
+        return amsFeign.adverseCloseSaleMaterial(saleMaterialId);
+    }
+
+    @ApiModelProperty(value = "反关闭金蝶整个销售订单")
+    @PostMapping("/adverseCloseSaleOrder")
+    public Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId) {
+        return amsFeign.adverseCloseSaleOrder(saleOrderId);
+    }
+
+    @ApiOperation(value = "承运起止范围与装货点")
+    @PostMapping("/getRangePoint")
+    public Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con
+    ) {
+        return amsFeign.getRangePoint(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
 }

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

@@ -638,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")

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

@@ -61,4 +61,21 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     public RESTfulResult deleteErrorResult(String orderNumber){
         return success(backgroundProcessingService.deleteErrorResult(orderNumber));
     }
+
+    @ApiOperation(value = "手动允许放行-OK字段")
+    @PostMapping("/allowEnfactory")
+    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/UniversalController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -913,7 +914,6 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
-
     @ApiModelProperty(value = "边输边查片区")
     @PostMapping("/getSaleAreaByLike")
     public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
@@ -945,4 +945,56 @@ public class UniversalController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiModelProperty(value = "边输边查收货地址")
+    @PostMapping("/getPlaceAndAddress")
+    public RESTfulResult getPlaceAndAddress(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getPlaceAndAddress(index == null ? "" : index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资名称")
+    @PostMapping("/getMaterialNameLike")
+    public RESTfulResult getMaterialNameLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getMaterialNameLike(index == null ? null : "%" + index + "%");
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "边输边查物资规格型号")
+    @PostMapping("/getSpecificationModelLike")
+    public RESTfulResult getSpecificationModelLike(@RequestBody Map<String,Object> map) {
+        List<Map<String, Object>> list = universalMapper.getSpecificationModelLike(map);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "关闭过期运输订单")
+    @PostMapping("/closePassedOrder")
+//    @Scheduled(cron = "0 0 8 * * ?")
+    public RESTfulResult closePassedOrder() {
+        List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
+        System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
+        int result = universalMapper.closePassedOrder();
+        System.out.println("订单关闭数为：" + result);
+        return success(result);
+    }
+
+    @ApiOperation(value = "内转计重承运合同物资")
+    @PostMapping("/getInwardWeightMaterial")
+    public RESTfulResult getInwardWeightMaterial(@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.getInwardWeightMaterial(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
 }

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

@@ -1732,4 +1732,18 @@ public interface AmsFeign {
                                             @RequestParam Integer shipperId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleMaterial")
+    Map<String, Object> adverseCloseSaleMaterial(@RequestParam Integer saleMaterialId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/adverseCloseSaleOrder")
+    Map<String, Object> adverseCloseSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getRangePoint")
+    Map<String, Object> getRangePoint(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam String con);
+
 }

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);
 
 
 

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

@@ -53,4 +53,6 @@ public interface BackgroundProcessingMapper {
 
     int deleteOutFactoryUnnecessaryResult(@Param("list") List<Integer> list);
 
+    int allowEnfactory(String orderNumber);
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.mapper;
 
+import io.swagger.models.auth.In;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
@@ -216,6 +217,18 @@ public interface UniversalMapper {
     int bandSaleArea(Map<String, Object> map);
 
     int getSteelOrderNum();
+    // 边输边查收货地址
+    List<Map<String, Object>> getPlaceAndAddress(String index);
+    // 边输边查物资名称
+    List<Map<String, Object>> getMaterialNameLike(String index);
+    // 边输边查物资规格型号
+    List<Map<String, Object>> getSpecificationModelLike(Map<String,Object> map);
+
+    int closePassedOrder();
+
+    List<Map<String,Object>> findPassedOrder();
+
+    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/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -13,6 +13,14 @@
         set APO.PURCHASING_ORGANIZATION_ID = #{orgId}
         where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
     </update>
+    <update id="allowEnfactory">
+        UPDATE TMSTRUCK_ENFACTORY_RESULT TER
+        SET TER.INSERT_UPDATE_REMARK = 'OK'
+        WHERE TER.RESULT_ID = (SELECT TER.RESULT_ID FROM OMSTRUCK_ORDER OO
+            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            WHERE OO.ORDER_NUMBER = #{orderNumber})
+    </update>
 
     <select id="getOrderType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         select OO.ORDER_TYPE from OMSTRUCK_ORDER OO

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

@@ -1080,6 +1080,95 @@
         AND   OO.ORDER_STATUS = 5
         AND   OO.ORDER_TYPE = 1
     </select>
+    <select id="getInwardWeightMaterial" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT * FROM (SELECT
+            RMT.MATERIAL_TYPE_ID "materialTypeId",
+            rm.MATERIAL_ID "materialId",
+            rm.MATERIAL_NAME "materialName",
+            rmt.MATERIAL_TYPE_NAME "materialTypeName"
+        FROM
+            RMS_MATERIAL RM
+                LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        WHERE
+        RM.DELETED = 0
+        AND RMT.MATERIAL_ISINWARD = 1
+        <if test="index != null">
+            AND instr(RM.MATERIAL_NAME, #{index}) > 0
+        </if>
+           )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTypeName != null">
+                and
+                <foreach collection="materialTypeName" item="item" open="(" separator="or" close=")">
+                    "materialTypeName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getPlaceAndAddress" parameterType="java.lang.String" resultType="java.util.Map" >
+        SELECT RRP.PLACE_ID                 "placeId",
+               RRA.ADDRESS_ID               "shipperAddressId",
+               RRP.ADDRESS_DELIVERY_ADDRESS "place",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+               RRP.ADDRESS_DELIVERY_ADDRESS "adressAndPlace"
+        FROM RMS_RECEIVE_PLACE RRP
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE (instr(RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS,
+                     #{index}) > 0)
+    </select>
+
+    <select id="getMaterialNameLike" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT DISTINCT RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="index != null">
+            AND RM.MATERIAL_NAME LIKE #{index}
+        </if>
+    </select>
+
+    <select id="getSpecificationModelLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpecificationModel",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_ID "value",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "label",
+        RM.MATERIAL_ID "id",
+        RM.MATERIAL_NAME "materialName"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="materialName != null">
+            AND (instr (RM.MATERIAL_NAME,#{materialName}) > 0)
+        </if>
+        <if test="specificationModel != null">
+            AND (instr (RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL, #{specificationModel}) >0)
+        </if>
+    </select>
+
+    <select id="findPassedOrder" resultType="java.util.Map">
+        SELECT OO.ORDER_ID "orderId",
+               RC.CAPACITY_NUMBER "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS IN (4,5)
+          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+          AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+          ORDER BY OO.ORDER_ID DESC
+    </select>
+
 
 <!-- 查询进口矿得采购订单-->
     <select id="selectPurchaseOrderForShip" resultType="java.util.Map" parameterType="java.util.Map">
@@ -1101,4 +1190,24 @@
                  </if>
     </select>
 
+
+    <update id="closePassedOrder" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_ID IN
+        (SELECT OO.ORDER_ID
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        WHERE OO.ORDER_TYPE = 1
+        AND OO.ORDER_STATUS IN (4,5)
+        AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+        AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+        )
+    </update>
+
 </mapper>