销售

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

@@ -58,12 +58,12 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public RESTfulResult getAmsContractTransportPrice(@RequestBody(required=false) Map<String,Object> mapValue,
                                                       Integer apiId,
                                                       Integer pageNum,
-                                                      Integer pageSize){
-
-        List<Map<String, Object>> amsContractTransportPrice = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
+                                                      Integer pageSize,
+                                                      Integer deleted){
+        if(deleted != null) mapValue.put("deleted", deleted);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsContractTransportPrice,amsContractTransportPrice1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
         return success(pageList);
     }
 

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

@@ -504,10 +504,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer pageNum,
                                             Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderInfoes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -521,10 +520,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderReportedes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -540,15 +538,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          Integer pageSize,
                                                          Integer apiId,
                                                          String con) {
-        if (con != null && !con.equals("undefined")) {
-            mapValue.put("con","%" + con + "%");
+        if (con != null  && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", con);
         }
         //不分页筛选数据
-        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getSaleOrderListBySaleCompanyes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompanyes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 
@@ -561,14 +558,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   @RequestParam String index){
-        if (index != null && !index.equals("undefined")) {
-            mapValue.put("index", "%" + index + "%");
+                                                   @RequestParam String con){
+        if (con != null && !"undefined".equals(con)) {
+            mapValue.put("con", con);
         }
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getAmsSaleOrderApprovedes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApprovedes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 

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

@@ -10,15 +10,15 @@ import java.util.Date;
 @ApiModel(value="汽运运输订单")
 public class OmstruckOrder implements IBasePO<BigDecimal> {
     /**
-     * 运输订单id(ORDER_ID,DECIMAL,38)
+     * 运输订单id(ORDER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="运输订单id",required=true)
     private BigDecimal orderId;
 
     /**
-     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID(ORDER_PLAN_ID,DECIMAL,38)
+     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID",required=false)
+    @ApiModelProperty(value="销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
     private BigDecimal orderPlanId;
 
     /**
@@ -28,7 +28,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private String orderNumber;
 
     /**
-     * 运力ID(CAPACITY_ID,DECIMAL,38)
+     * 运力ID(CAPACITY_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="运力ID",required=false)
     private BigDecimal capacityId;
@@ -40,7 +40,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private Date orderIssueTime;
 
     /**
-     * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,38)
+     * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,0)
      */
     @ApiModelProperty(value="司机操作订单行为：0：拒绝；1：接收",required=false)
     private BigDecimal orderReceiveStatus;
@@ -58,7 +58,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderCommunicationDuration;
 
     /**
-     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭(ORDER_STATUS,DECIMAL,38)
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭(ORDER_STATUS,DECIMAL,0)
      */
     @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭",required=false)
     private BigDecimal orderStatus;
@@ -100,13 +100,13 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转）(ORDER_TYPE,DECIMAL,0)
+     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转）",required=false)
+    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
     private BigDecimal orderType;
 
     /**
-     * 路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）(ORDER_LINE_SEQUENCE,DECIMAL,38)
+     * 路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）(ORDER_LINE_SEQUENCE,DECIMAL,0)
      */
     @ApiModelProperty(value="路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）",required=false)
     private BigDecimal orderLineSequence;
@@ -135,6 +135,18 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="司机确认订单（1：已确认）",required=false)
     private BigDecimal driverConfirmation;
 
+    /**
+     * 运输单价ID(PRICE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 订单所属承运商ID(CARRIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单所属承运商ID",required=false)
+    private BigDecimal carrierId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -315,6 +327,22 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.driverConfirmation = driverConfirmation;
     }
 
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -342,6 +370,8 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", orderEntryTime=").append(orderEntryTime);
         sb.append(", unloadPointId=").append(unloadPointId);
         sb.append(", driverConfirmation=").append(driverConfirmation);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", carrierId=").append(carrierId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -309,6 +309,19 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
         // 销售订单主键
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+        if(mapValue.get("sendAgain") == null){
+            // 得到销售订单中的总重量和销售订单下的总净重
+            BigDecimal saleMaterialWeight = amsSaleOrderMaterialMapper.getMaterialWeightByOrderId(saleOrderId);
+            BigDecimal saleMaterialNetWeight = amsSaleOrderMaterialMapper.getMaterialNetWeightBySaleId(saleOrderId);
+            if (saleMaterialNetWeight == null) {
+                saleMaterialNetWeight = new BigDecimal(0);
+            }
+            // 计算净重所占销售订单中的比例
+            Double percent = saleMaterialNetWeight.doubleValue()/saleMaterialWeight.doubleValue();
+            if (percent >= 0.97) {
+                return -1;
+            }
+        }
         // 车序号计数
         int count = 1;
         // 遍历每一个列
@@ -409,6 +422,10 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             omstruckOrder.setOrderId(orderId);
             // 车序号主键
             omstruckOrder.setOrderPlanId(saleOrderMaterialId);
+            //添加承运商ID 和 运价ID
+            Object priceId = map.get("priceId");
+            if(priceId != null) omstruckOrder.setPriceId(DataChange.dataToBigDecimal(priceId));
+            omstruckOrder.setCarrierId(carrierId);
             // 运输订单号
             omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD",orderId.intValue()));
             // 运力id
@@ -462,17 +479,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             // 车序号累加
             count++;
         }
-        // 得到销售订单中的总重量和销售订单下的总净重
-        BigDecimal saleMaterialWeight = amsSaleOrderMaterialMapper.getMaterialWeightByOrderId(saleOrderId);
-        BigDecimal saleMaterialNetWeight = amsSaleOrderMaterialMapper.getMaterialNetWeightBySaleId(saleOrderId);
-        if (saleMaterialNetWeight == null) {
-            saleMaterialNetWeight = new BigDecimal(0);
-        }
-        // 计算净重所占销售订单中的比例
-        Double percent = saleMaterialNetWeight.doubleValue()/saleMaterialWeight.doubleValue();
-        if (percent >= 0.97) {
-            result = -1;
-        }
+
         return result;
     }
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -652,6 +652,11 @@
     on a_t_price.OIL_TYPE_ID = r_o_type.OIL_TYPE_ID
 --     where a_t_price.DELETED = 0
 --     and a_t_price.TYPE = 1 and a_t_price.DEPARTMENT = 2
+    <where>
+        <if test="deleted != null">
+          and a_t_price.DELETED = #{deleted}
+        </if>
+    </where>
         )
 
     <where>

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

@@ -519,14 +519,15 @@
     ON apo.PURCHASING_ORGANIZATION_ID = rsb.SHIPPER_ID
     LEFT JOIN RMS_SHIPPER rsr
     ON apo.RECEIVE_UNIT_ID = rsr.SHIPPER_ID
-    <where>
+    where
+      apo.DELETED = 0
       <if test="con != null" >
         and instr(apo.PURCHASE_ORDER_NO, #{con}) > 0 or instr(rsu.SUPPLIER_NAME, #{con}) > 0
       </if>
       <if test="sendCompId != null and con == null">
         and apo.SUPPLIER_UNIT_ID = #{sendCompId}
       </if>
-    </where>
+
 
     )
     <where>

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

@@ -1766,93 +1766,90 @@
     on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS in (2,4)
     and a_s_order.CLOSE_STATUS is null
-    and a_s_order.DELETED = 0) SSSR
-    <if test="con != null">
-      where SSSR."consigneeCompanyName" LIKE #{con}
-    </if>
+    and a_s_order.DELETED = 0
     <if test="con != null">
-      or SSSR."saleNumber" LIKE #{con}
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
-<!--    <where>-->
-<!--          <if test="saleNumber != null">-->
-<!--            and-->
-<!--            <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">-->
-<!--              "saleNumber" like '%${item}%'-->
-<!--            </foreach>-->
-<!--          </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>-->
+    )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </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>
     <include refid="orderBy"></include>
   </select>
 
@@ -1878,7 +1875,11 @@
     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
-    where a_s_order.SALE_ORDER_STATUS=4)
+    where a_s_order.SALE_ORDER_STATUS=4
+    <if test="con != null">
+      and instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0
+    </if>
+        )
     <where>
       <if test="saleNumber != null">
         and
@@ -2036,7 +2037,7 @@
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
     <if test="con != null" >
-      AND RM.MATERIAL_NAME LIKE #{con}
+      AND instr(RM.MATERIAL_NAME, #{con}) > 0
     </if>
   </select>
 

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

@@ -23,25 +23,28 @@
         <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime" />
         <result column="UNLOAD_POINT_ID" jdbcType="DECIMAL" property="unloadPointId" />
         <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
+        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
     </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
+    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
+    PRICE_ID, CARRIER_ID
     </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,
     t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME,
     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.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID
     </sql>
     <sql id="select">
-        SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER
+        SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER t
+        SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER t
     </sql>
     <sql id="where">
         <where>
@@ -108,6 +111,12 @@
             <if test="driverConfirmation != null">
                 and DRIVER_CONFIRMATION = #{driverConfirmation}
             </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -175,6 +184,12 @@
             <if test="driverConfirmation != null">
                 and DRIVER_CONFIRMATION = #{driverConfirmation}
             </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -244,6 +259,12 @@
         <if test="driverConfirmation != null">
             or DRIVER_CONFIRMATION = #{driverConfirmation}
         </if>
+        <if test="priceId != null">
+            or PRICE_ID = #{priceId}
+        </if>
+        <if test="carrierId != null">
+            or CARRIER_ID = #{carrierId}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -253,7 +274,8 @@
                                     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                     DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
-                                    DRIVER_CONFIRMATION)
+                                    DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID
+        )
         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},
@@ -261,7 +283,8 @@
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
-                #{driverConfirmation,jdbcType=DECIMAL})
+                #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -329,6 +352,12 @@
             <if test="driverConfirmation != null">
                 DRIVER_CONFIRMATION,
             </if>
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -394,6 +423,12 @@
             <if test="driverConfirmation != null">
                 #{driverConfirmation,jdbcType=DECIMAL},
             </if>
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                #{carrierId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -417,7 +452,9 @@
             LINE_ID = #{lineId,jdbcType=DECIMAL},
             ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
             UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
-            DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL}
+            DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -483,20 +520,26 @@
             <if test="driverConfirmation != null">
                 DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
             </if>
+            <if test="priceId != null">
+                PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into OMSTRUCK_ORDER
@@ -509,7 +552,8 @@
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
-        DRIVER_CONFIRMATION)
+        DRIVER_CONFIRMATION, PRICE_ID,
+        CARRIER_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -521,105 +565,114 @@
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
         #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL}, #{item.orderLineSequence,jdbcType=DECIMAL},
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
-        #{item.driverConfirmation,jdbcType=DECIMAL} from dual
+        #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
+        #{item.carrierId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update OMSTRUCK_ORDER
         set
         ORDER_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_PLAN_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPlanId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNumber,jdbcType=VARCHAR}
         </foreach>
         ,CAPACITY_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_ISSUE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderIssueTime,jdbcType=TIMESTAMP}
         </foreach>
         ,ORDER_RECEIVE_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveStatus,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_RECEIVE_REFUSE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}
         </foreach>
         ,ORDER_COMMUNICATION_DURATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderCommunicationDuration,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_STATUS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderStatus,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_TYPE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderType,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_LINE_SEQUENCE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderLineSequence,jdbcType=DECIMAL}
         </foreach>
         ,LINE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
         </foreach>
         ,ORDER_ENTRY_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.orderEntryTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UNLOAD_POINT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.unloadPointId,jdbcType=DECIMAL}
         </foreach>
         ,DRIVER_CONFIRMATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.driverConfirmation,jdbcType=DECIMAL}
         </foreach>
+        ,PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,CARRIER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+        </foreach>
         where ORDER_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from OMSTRUCK_ORDER
         where ORDER_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>