Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -1,12 +1,16 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
-
+import com.steerinfo.dil.util.*;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
@@ -16,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -45,8 +50,13 @@ public class OmstruckOrderController extends BaseRESTfulController {
     ESFeign esFeign;
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
+    @Autowired
+    EASCapacityTestUtil easCapacityTestUtil;
+    @Autowired
+    JoinFeign joinFeign;
 
 
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     /**
      * 展示承运商接收销售公司已接受的销售订单
      *
@@ -793,6 +803,20 @@ public class OmstruckOrderController extends BaseRESTfulController {
     public RESTfulResult updateCapacityId(@RequestBody Map<String,Object> map) {
         int result = omstruckOrderService.updateCapacityId(map);
         if (result == 1) {
+//            BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+//            OmstruckOrder omstruckOrder1 = omstruckOrderMapper.selectByPrimaryKey(orderId);
+//            // 如果是钢材车辆，同步修改分录车号
+//            if (omstruckOrder1.getOrderType().intValue() == 1) {
+//                BigDecimal saleOrderMaterialId = omstruckOrder1.getOrderPlanId();
+//                Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+//                Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
+//                totalMap.put("input",input);
+//                System.out.println(totalMap);
+//                String json = JSONUtils.toJSONString(totalMap);
+//                System.out.println(json);
+//                Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
+//                System.out.println(s);
+//            }
             return success(result);
         }
         else {
@@ -1097,14 +1121,19 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   Integer orderStatus,
                                                   String carrierId,
-                                                  String con) {
+                                                  String con,
+                                                    String startTime,String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId",carrierId);
         }
+        if(con != null && !"null".equals(con)){
+            mapValue.put("con","%" + con  + "%");
+        }
         mapValue.put("orderStatus",(orderStatus));
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getInwardOrderList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);

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

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author hujianguo
+ * @create 2021-10-29 11:23
+ */
+@FeignClient(value = "dil-join-api-dev", url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+    // 得到销售订单信息
+    @PostMapping("/api/v1/join/amssaleorder/getSaleOrder")
+    Map<String,Object> getSaleOrder(@RequestParam BigDecimal saleOrderId);
+
+    // 推送销售订单到金蝶
+    @PostMapping("/api/v1/join/wsface/pushSaleOrderToEas")
+    Map<String,Object> pushSaleOrderToEas(@RequestBody Map<String, Object> map);
+
+    // 同步关闭金蝶销售订单
+    @PostMapping("/api/v1/join/wsface/deleteSaleOrderToEas")
+    Map<String,Object> deleteSaleOrderToEas(@RequestBody Map<String, Object> map);
+
+    // 推送车牌号到金蝶
+    @PostMapping("/api/v1/join/wsface/pushCarNumberToEas")
+    Map<String,Object> pushCarNumberToEas(@RequestBody Map<String, Object> map);
+
+    // 查询车牌号和金蝶分录
+    @PostMapping("/api/v1/join/wsface/findCarNumberByOrderId")
+    Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+}

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

@@ -58,13 +58,13 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderCommunicationDuration;
 
     /**
-     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭(ORDER_STATUS,DECIMAL,0)
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业(ORDER_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭",required=false)
+    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业",required=false)
     private BigDecimal orderStatus;
 
     /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建人",required=false)
     private String insertUsername;
@@ -171,6 +171,12 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="操作人员组织",required=false)
     private String optionerCode;
 
+    /**
+     * 是否可作业(CAN_WORK,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否可作业",required=false)
+    private BigDecimal canWork;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -399,6 +405,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.optionerCode = optionerCode == null ? null : optionerCode.trim();
     }
 
+    public BigDecimal getCanWork() {
+        return canWork;
+    }
+
+    public void setCanWork(BigDecimal canWork) {
+        this.canWork = canWork;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -432,6 +446,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", orderPrintStatus=").append(orderPrintStatus);
         sb.append(", driverTel=").append(driverTel);
         sb.append(", optionerCode=").append(optionerCode);
+        sb.append(", canWork=").append(canWork);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1,13 +1,16 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.IMFeign;
+import com.steerinfo.dil.feign.JoinFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EASCapacityTestUtil;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -71,6 +74,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Autowired
     private ZJXLUtilMapper zjxlUtilMapper;
 
+    @Autowired
+    JoinFeign joinFeign;
+
+
     /**
      * 用于远程调用运输订单新增
      *
@@ -230,10 +237,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         String orgCode =(String) map.get("orgCode");
+        String userId = (String) map.get("userId");
         if (orgCode!=null){
            omstruckOrder.setOptionerCode(orgCode);
-        }else {
-            return null;
         }
         //生成订单主键Id
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
@@ -279,7 +285,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         //添加订单类型
         omstruckOrder.setOrderType(orderType);
-        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.setInsertUsername(userId);
         omstruckOrder.setInsertTime(new Date());
         return omstruckOrder;
     }
@@ -2009,7 +2015,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 15:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.put("loadName","老区轨道衡");
+                mesMap.put("loadName","铁专线—五线");
+                mesMap.put("inwardType","拼装车皮进厂");
                 break;
             case 16:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
@@ -2017,11 +2024,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                mesMap.put("inwardType", "计重");
+                mesMap.put("inwardType", "内转计重");
                 break;
             case 21:
                 mesMap = omstruckOrderMapper.getInwardTimeOrderMessageToApp(map);
-                mesMap.put("inwardType", "计时");
+                mesMap.put("inwardType", "内转计时");
                 break;
             case 12:
             case 13:

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -14,8 +14,6 @@ import java.util.Map;
  */
 
 public class DataChange {
-
-
     /**
      * 解析前端传来的日期字符串
      * @param vueDate
@@ -72,7 +70,7 @@ public class DataChange {
         if(date == null)
             return null;
         try{
-             changeDate = (Date) date;
+            changeDate = (Date) date;
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -167,7 +165,7 @@ public class DataChange {
     }
 
     /**
-     * 根据时间段查询数据
+     * 根据时间段查询数据 支持只选择单个时间
      * @Author TXF
      * @Date 2022/1/10 23:21
      * @param startTime
@@ -188,4 +186,74 @@ public class DataChange {
             map.put("oneDate", sdf.format(new Date()));
         }
     }
+
+    /**
+     * 只支持两个时间查询
+     * @Author TXF
+     * @Date 2022/1/15 9:08
+     * @param startTime
+     * @param endTime
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDateTime(String startTime, String endTime, Map<String, Object> map,SimpleDateFormat sdf){
+        SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime))));
+        }
+        //如果开始时间和结束时间有且只有一个为空 则只查那天的数据
+        else if((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))){
+            if(startTime != null && !"null".equals(startTime)){
+                queryDataByTwoDateSon(map, startTime, sdfDate);
+            }
+            if(endTime != null && !"null".equals(endTime)){
+                queryDataByTwoDateSon(map, endTime, sdfDate);
+            }
+        }else {
+            //如果两者时间都为空，则查询当天数据
+            String nowDate = sdfDate.format(new Date());
+            map.put("oneDate", nowDate + " 00:00:00");
+        }
+    }
+
+    /**
+     * 上面方法的儿子方法 如果只传入了一个时间 则查询那天的数据
+     * @Author TXF
+     * @Date 2022/1/17 16:17
+     * @param map
+     * @param time
+     * @param sdfDate
+     * @return
+     **/
+    private static void queryDataByTwoDateSon(Map<String, Object> map, String time, SimpleDateFormat sdfDate){
+        Date date1 = new Date(Long.parseLong(time));
+        Date date2 = new Date(Long.parseLong(time) + 86400000);
+        String dayStartTime = sdfDate.format(date1);
+        String dayEndTime = sdfDate.format(date2);
+        map.put("startDate", dayStartTime + " 00:00:00");
+        map.put("endDate", dayEndTime + " 00:00:00");
+    }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id,String pot){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + pot + sdf.format(new Date()) + pot);
+        sb.append(
+                id < 10
+                        ? "0000000" + id : id < 100
+                        ? "000000" + id : id < 1000
+                        ? "00000" + id : id < 10000
+                        ? "0000" + id : id < 100000
+                        ? "000" + id : id < 1000000
+                        ? "00" + id : id < 10000000
+                        ? "0" + id : id.toString()
+        );
+        return sb.toString();
+    }
 }

src/main/java/com/steerinfo/dil/util/EASCapacityTestUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶测试环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASCapacityTestUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "A004";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/resources/application-prod.yml

@@ -20,5 +20,7 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
   port: 8095

src/main/resources/bootstrap.yml

@@ -32,7 +32,7 @@ cache:
 redis:
   host: 10.10.50.28
   port: 6379
-  pwd: 123456
+  pwd: adhykdj
   project:
     prefix: sysmanage
   pool:

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

@@ -29,13 +29,14 @@
         <result column="ORDER_PRINT_STATUS" jdbcType="DECIMAL" property="orderPrintStatus" />
         <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
         <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
+        <result column="CAN_WORK" jdbcType="DECIMAL" property="canWork" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
     ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
-    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
@@ -43,7 +44,7 @@
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
     t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
     t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
-    t.DRIVER_TEL, t.OPTIONER_CODE
+    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -134,6 +135,9 @@
             <if test="optionerCode != null and optionerCode != ''">
                 and OPTIONER_CODE = #{optionerCode}
             </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -219,6 +223,9 @@
             <if test="optionerCode != null and optionerCode != ''">
                 and OPTIONER_CODE LIKE '%${optionerCode}%'
             </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -306,6 +313,9 @@
         <if test="optionerCode != null and optionerCode != ''">
             or OPTIONER_CODE = #{optionerCode}
         </if>
+        <if test="canWork != null">
+            or CAN_WORK = #{canWork}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -317,7 +327,7 @@
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
                                     DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
                                     TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
-                                    OPTIONER_CODE)
+                                    OPTIONER_CODE, CAN_WORK)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
@@ -327,7 +337,7 @@
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
                 #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
                 #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
-                #{optionerCode,jdbcType=VARCHAR})
+                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -413,6 +423,9 @@
             <if test="optionerCode != null">
                 OPTIONER_CODE,
             </if>
+            <if test="canWork != null">
+                CAN_WORK,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -496,6 +509,9 @@
             <if test="optionerCode != null">
                 #{optionerCode,jdbcType=VARCHAR},
             </if>
+            <if test="canWork != null">
+                #{canWork,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -525,7 +541,8 @@
             TRIP_ID = #{tripId,jdbcType=VARCHAR},
             ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
             DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
-            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR}
+            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            CAN_WORK = #{canWork,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -609,6 +626,9 @@
             <if test="optionerCode != null">
                 OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
             </if>
+            <if test="canWork != null">
+                CAN_WORK = #{canWork,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
@@ -637,7 +657,8 @@
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
         DRIVER_CONFIRMATION, PRICE_ID,
         CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
-        DRIVER_TEL, OPTIONER_CODE)
+        DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -651,7 +672,8 @@
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
         #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
         #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
-        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR} from dual
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -765,6 +787,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.optionerCode,jdbcType=VARCHAR}
         </foreach>
+        ,CAN_WORK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.canWork,jdbcType=DECIMAL}
+        </foreach>
         where ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}
@@ -1194,7 +1220,9 @@
         RS.SHIPPER_NAME "shipperName",
         RCO.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
-        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt"
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus"
         from OMSTRUCK_ORDER OO
         left join AMS_SALE_ORDER_MATERIAL ASOM
         on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -1860,7 +1888,8 @@
         RC3.CARRIER_NAME "carrierName",
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        OO.DRIVER_TEL "drivelTel"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -2014,10 +2043,6 @@
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         <where>
-            <if test="orderStatus!=null">
-                AND OO.ORDER_STATUS = #{orderStatus}
-            </if>
-
             <if test="saleOrderId!=null">
                 AND ASO.SALE_ORDER_ID = #{saleOrderId}
             </if>
@@ -2025,7 +2050,6 @@
             <if test="numberPlate!=null">
                 AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
             </if>
-
         </where>
         ) RRC
         <if test="con != null">
@@ -2711,7 +2735,8 @@
         AIP.INSERT_TIME                    AS "insertTime",
         RW.WAREHOUSE_NAME                  AS "unloadName",
         RW1.WAREHOUSE_NAME                 AS "loadName",
-        RM.MATERIAL_NAME                   AS "materialName"
+        RM.MATERIAL_NAME                   AS "materialName",
+        RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RW1.WAREHOUSE_NAME || RW.WAREHOUSE_NAME "likeCon"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
@@ -2742,8 +2767,18 @@
         <if test="orderStatus != null">
             AND OO.ORDER_STATUS = #{orderStatus}
         </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
         )
         <where>
+            <if test="con != null">
+                and "likeCon" like #{con}
+            </if>
             <if test="materialNumber != null">
                 and
                 <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
@@ -3776,8 +3811,9 @@
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
-        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
         CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
         TTR.RESULT_TOTAL_ID "resultTotalId"
 

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

@@ -118,7 +118,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -317,7 +317,7 @@
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>