'销售销售'

pom.xml

@@ -112,8 +112,8 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMS_SALE_ORDER_MATERIAL</param><!--销售计划物资中间表-->
-<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
+                        <param>AMSSHIP_DELIVERY_NOTICE</param><!--销售计划物资中间表-->
+<!--                        <param>AMSTRUCK_RAIL_DAYP·LAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->

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

@@ -928,10 +928,27 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
     })
-    @PostMapping(value = "/修改收货地址")
+    @PostMapping(value = "/updateCarAddress")
     public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) {
-        //分页数据
         int result = amsSaleOrderService.updateCarAddress(mapValue);
+        // 如果返回结果为0，则认定是关闭了车辆
+        if (result == 0) {
+            // 调用修改接口同步修改金蝶数据
+            BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+            // 调用金蝶接口，将销售订单推送到金蝶系统
+            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+            Map<String, Object> head = (Map<String, Object>) input.get("head");
+            head.put("status","update");
+            // 获得金蝶接口配置
+            Map<String, Object> totalMap = easUtil.getTotalMap();
+            // 组装报文
+            totalMap.put("input",input);
+            System.out.println(totalMap);
+            String json = JSONUtils.toJSONString(totalMap);
+            System.out.println(json);
+            Map<String,Object> s = joinFeign.pushSaleOrderToEas(totalMap);
+            System.out.println(s);
+        }
         return success(result);
     }
 
@@ -951,20 +968,20 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.updateAllMaterialInSale(mapValue);
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
         // 调用金蝶接口，将销售订单推送到金蝶系统
-        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
-        Map<String, Object> head = (Map<String, Object>) input.get("head");
-        head.put("status", "update");
-        // 获得金蝶接口配置:正式
+//        Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
+//        Map<String, Object> head = (Map<String, Object>) input.get("head");
+//        head.put("status", "update");
+//        // 获得金蝶接口配置:正式
+////        Map<String, Object> totalMap = easUtil.getTotalMap();
+//        // 获得金蝶接口配置:测试
 //        Map<String, Object> totalMap = easUtil.getTotalMap();
-        // 获得金蝶接口配置:测试
-        Map<String, Object> totalMap = easUtil.getTotalMap();
-        // 组装报文
-        totalMap.put("input", input);
-        System.out.println(totalMap);
-        String json = JSONUtils.toJSONString(totalMap);
-        System.out.println(json);
-        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
-        System.out.println(resultMap);
+//        // 组装报文
+//        totalMap.put("input", input);
+//        System.out.println(totalMap);
+//        String json = JSONUtils.toJSONString(totalMap);
+//        System.out.println(json);
+//        Map<String,Object> resultMap = joinFeign.pushSaleOrderToEas(totalMap);
+//        System.out.println(resultMap);
         return success(result);
     }
 
@@ -979,11 +996,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer apiId,
-                                            String con
+                                            String con,
+                                            BigDecimal deleted
     ) {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
         }
+        mapValue.put("deleted",deleted);
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -998,4 +1017,32 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         int result = amsSaleOrderService.deleteSaleOrderSame(mapValue);
         return success(result);
     }
+
+    @ApiModelProperty(value = "展示反审批的钢材订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "481", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSteelOrderDeletedList")
+    public RESTfulResult getSteelOrderDeletedList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            String con,
+                                                  String consigneeSsoId
+    ) {
+        if (con != null && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", con);
+        }
+        if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
+            mapValue.put("consigneeSsoId", consigneeSsoId);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSteelOrderDeletedList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderList);
+        return success(pageList);
+    }
 }

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

@@ -126,4 +126,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     List<Map<String, Object>> getFuSaleOrderList(Map<String,Object> truckNoMap);
     // 副产品关闭未进厂的运单
     int closeOrderNotIn(BigDecimal saleOrderId);
+    // 展示反审批的销售订单
+    List<Map<String, Object>> getSteelOrderDeletedList();
 }

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/IAmsSaleOrderService.java

@@ -151,4 +151,6 @@ public interface IAmsSaleOrderService {
     List<Map<String,Object>> getFuSaleOrderList(Map<String,Object> map);
     // 同步关闭金蝶销售订单
     int deleteSaleOrderSame(Map<String, Object> mapValue);
+    // 展示反审批的钢材订单
+    List<Map<String, Object>> getSteelOrderDeletedList(Map<String, Object> mapValue);
 }

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

@@ -783,6 +783,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrder.setCapacityId(capacityId);
                 // 承运商
                 omstruckOrder.setCarrierId(carrierId);
+                // 是否可作业
+                omstruckOrder.setCanWork(new BigDecimal(0));
                 // 下发时间
                 omstruckOrder.setOrderIssueTime(new Date());
                 // 运单状态
@@ -1245,15 +1247,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateCarAddress(Map<String, Object> mapValue) {
         // 判断是否需要删除金蝶分录
         Integer isCloseEas = (Integer) mapValue.get("isCloseEas");
-        // 判断是否需要修改派车
-        Object isNewCar = mapValue.get("isNewCar");
-        // 销售订单主键
-        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
-        // 车序号id
-        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
         int result = 0;
         // 运输订单id
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        // 车序号id
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
         // 是
         if (isCloseEas == 0 && orderId != null && orderId.intValue() != 0) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
@@ -1267,21 +1265,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 BigDecimal saleMaterialId = (BigDecimal) map.get("saleMaterialId");
                 amsSaleMaterialMapper.deleteByPrimaryKey(saleMaterialId);
             }
-            // 调用金蝶接口，将销售订单推送到金蝶系统
-            Map<String, Object> input = joinFeign.getSaleOrder(saleOrderId);
-            Map<String, Object> head = (Map<String, Object>) input.get("head");
-            head.put("status","update");
-            // 获得金蝶接口配置
-            Map<String, Object> totalMap = easUtil.getTotalMap();
-            // 组装报文
-            totalMap.put("input",input);
-            System.out.println(totalMap);
-            String json = JSONUtils.toJSONString(totalMap);
-            System.out.println(json);
-            Map<String,Object> s = joinFeign.pushSaleOrderToEas(totalMap);
-            System.out.println(s);
             return 0;
         }
+        // 判断是否需要修改派车
+        Object isNewCar = mapValue.get("isNewCar");
         // 省市县ID
         BigDecimal shippingAddressId = DataChange.dataToBigDecimal(mapValue.get("shipperAddressId"));
         // 具体地址
@@ -1308,6 +1295,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             if (dispatchId != null) {
                 amsDispatchSaleOrderMapper.deleteByPrimaryKey(dispatchId);
             }
+            if (orderId != null) {
+                omstruckOrderMapper.deleteByPrimaryKey(orderId);
+            }
             if (amsSaleOrderMaterial.getSaleShippingAddressId() != null) {
                 // 自动匹配承运商
                 List<Map<String, Object>> carrierList = getCarrierByPlace(amsSaleOrderMaterial.getSaleShippingAddressId());
@@ -1390,6 +1380,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
         BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
+        // 将车辆改为不可作业状态
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        omstruckOrder.setOrderId(orderId);
+        omstruckOrder.setCanWork(new BigDecimal(1));
+        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         // 得到运单中的物资
         List<Map<String, Object>> oldList = omstruckOrderMaterialMapper.getMaterialList(orderId);
         Map<String, Object> toTmsMap = new HashMap<>();
@@ -1529,4 +1524,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
         return result;
     }
+
+    /**
+     * 展示反审批的钢材订单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSteelOrderDeletedList(Map<String, Object> mapValue) {
+        List<Map<String, Object>> mapList = amsSaleOrderMapper.getSteelOrderDeletedList();
+        return mapList;
+    }
 }

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

@@ -27,10 +27,10 @@ public class ColumnDataUtil {
 
     public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
-//        for (Map<String, Object> columnData : columnDataList) {
-//            //每个表头字段的过滤条件
-//            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
-//        }
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+        }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);
         return pageList;

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

@@ -3457,7 +3457,7 @@
     WHERE ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
   </select>
 
-  <select id="getSaleMaterialId" parameterType="DECIMAL" resultType="DECIMAL" >
+  <select id="getSaleMaterialId" parameterType="DECIMAL" resultType="java.util.Map" >
     SELECT ASTM.MATERIAL_ID AS "saleMaterialId"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
@@ -3564,7 +3564,7 @@
     where ASM.SALE_WAREHOUSE = '副产品库'
     and a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
-    and a_s_order.DELETED = 0
+    and a_s_order.DELETED = #{deleted}
     and a_s_order.SHIPPER_ID = 1
     and a_s_order.SALE_TYPE is null
     <if test="con != null">
@@ -3697,24 +3697,175 @@
   </update>
 
   <select id="getCarMessageToEas" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
-    SELECT
-        RCA.CAPACITY_NUMBER AS "r1c1",
-           OO.ORDER_NUMBER AS "r1c2",
-            RM.EAS_MATERIAL_ID AS "r1c3",
-           RM.MATERIAL_NAME AS "r1c4",
+    SELECT RCA.CAPACITY_NUMBER                            AS "r1c1",
+           OO.ORDER_NUMBER                                AS "r1c2",
+           RM.EAS_MATERIAL_ID                             AS "r1c3",
+           RM.MATERIAL_NAME                               AS "r1c4",
            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "r1c5"
-FROM OMSTRUCK_ORDER OO
-    LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-    ON OOM.ORDER_ID = OO.ORDER_ID
+    FROM OMSTRUCK_ORDER OO
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                     ON OOM.ORDER_ID = OO.ORDER_ID
+           LEFT JOIN RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+           LEFT JOIN RMS_CAPACITY RCA
+                     ON OO.CAPACITY_ID = RCA.CAPACITY_ID
+           LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                     ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+           LEFT JOIN AMS_SALE_ORDER ASO
+                     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+           LEFT JOIN RMS_CONSIGNEE RC
+                     ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+  </select>
+
+  <select id="getSteelOrderDeletedList" resultType="java.util.Map" parameterType="java.util.Map">
+    select * from(
+    select a_s_order.SALE_ORDER_ID "saleOrderId",
+    a_s_order.SALE_NUMBER "saleNumber",
+    r_shipper.SHIPPER_NAME "shipperName",
+    r_consignee.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+    r_consignee.CONSIGNEE_WARRANTY_AMOUNT "consigneeWarrantyAmount",
+    r_consignee.CONSIGNEE_WARRANTY_WEIGHT "consigneeWarrantyWeight",
+    a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
+    a_s_order.SALE_ACCOUNT_BALANCE "saleAccountBalance",
+    a_s_order.SALE_CURRENT_ORDER_AMOUNT "saleCurrentOrderAmount",
+    a_s_order.SALE_HISTORICAL_ORDER_AMOUNT "saleHistoricalOrderAmout",
+    a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+    a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
+    a_s_order.SALE_ORDER_TAX "saleOrderTax",
+    a_s_order.SALE_REMARK "saleRemark",
+    a_s_order.INSERT_TIME "insertTime",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    ASM.SALE_WAREHOUSE "saleWareHouse"
+    from AMS_SALE_ORDER a_s_order
+    left join RMS_SHIPPER r_shipper
+    on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
+    left join RMS_CONSIGNEE r_consignee
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_MATERIAL RM
-    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-LEFT JOIN RMS_CAPACITY RCA
-    ON OO.CAPACITY_ID = RCA.CAPACITY_ID
-LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-LEFT JOIN AMS_SALE_ORDER ASO
-ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-LEFT JOIN RMS_CONSIGNEE RC
-ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    where a_s_order.SALE_ORDER_STATUS in (2,4)
+    and a_s_order.DELETED = 1
+    and a_s_order.SALE_TYPE = 1
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
+    <if test="consigneeSsoId != null">
+      and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    ORDER BY a_s_order.UPDATE_TIME DESC
+    )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="statusStr != null">
+        <foreach collection="statusStr" item="item" open="(" separator="or" close=")">
+          and "statusStr" like '%${item}%'
+        </foreach>
+      </if>
+
+      <!--      <if test="startTime != null">-->
+      <!--        and "insertTime" &gt;= to_date('${startTime}','yyyy-mm-dd')-->
+      <!--      </if>-->
+      <!--      <if test="endTime != null">-->
+      <!--        and "insertTime" &lt;= to_date('${endTime}','yyyy-mm-dd')-->
+      <!--      </if>-->
+
+      <if test="shipperName != null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        and
+        <foreach collection="consigneeWarrantyAmount" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyAmount" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        and
+        <foreach collection="consigneeWarrantyWeight" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyWeight" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderIsselfMention != null">
+        and
+        <foreach collection="saleOrderIsselfMention" item="item" open="(" separator="or" close=")">
+          "saleOrderIsselfMention" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleAccountBalance != null">
+        and
+        <foreach collection="saleAccountBalance" item="item" open="(" separator="or" close=")">
+          "saleAccountBalance" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleCurrentOrderAmount != null">
+        and
+        <foreach collection="saleCurrentOrderAmount" item="item" open="(" separator="or" close=")">
+          "saleCurrentOrderAmount" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleHistoricalOrderAmout != null">
+        and
+        <foreach collection="saleHistoricalOrderAmout" item="item" open="(" separator="or" close=")">
+          "saleHistoricalOrderAmout" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderReceiveCustomer != null">
+        and
+        <foreach collection="saleOrderReceiveCustomer" item="item" open="(" separator="or" close=")">
+          "saleOrderReceiveCustomer" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleUnitPrice != null">
+        and
+        <foreach collection="saleUnitPrice" item="item" open="(" separator="or" close=")">
+          "saleUnitPrice" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderTax != null">
+        and
+        <foreach collection="saleOrderTax" item="item" open="(" separator="or" close=")">
+          "saleOrderTax" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleRemark != null">
+        and
+        <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">
+          "saleRemark" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
   </select>
 </mapper>

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,9 +223,12 @@
             <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="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -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,10 +626,13 @@
             <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>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -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}