修改销售合同

pom.xml

@@ -113,7 +113,7 @@
                     <tables>
                         <param>AMS_DISPATCH_SALE_ORDER</param><!--销售计划-->
 <!--                        <param>AMS_SALE_PLAN_MATERIAL</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
-<!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售订单&ndash;&gt;-->
+<!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>AMS_SALE_ORDER_MATERIAL</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
                     </tables>

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

@@ -130,7 +130,7 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
      * @param apiId
      * @return
      */
-    @ApiModelProperty(value = "展示汽运单价列表")
+    @ApiModelProperty(value = "展示采购汽运单价列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
@@ -149,6 +149,33 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
         return success(data);
     }
 
+    /**
+     * 展示汽运单价
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示销售汽运单价列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "139", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleTruckPriceList")
+    public RESTfulResult getSaleTruckPriceList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        List<Map<String, Object>> list = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
     /**
      * 新增汽运单价
      * @param amsContractTransportPrice

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

@@ -110,4 +110,6 @@ public interface AmsContractTransportPriceMapper extends IBaseMapper<AmsContract
 
     @Select("select seq_AMS_TRANSPORT.nextval from dual")
     BigDecimal selectTransportId();
+    // 得到销售汽运单价
+    List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -39,10 +40,10 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private BigDecimal capacityId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 物资ID(MATERIAL_ID,CHAR,10)
      */
     @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
+    private String materialId;
 
     /**
      * 吨公里（元/吨.km）(PRICE_TON_KILOMETER,DECIMAL,0)
@@ -105,9 +106,9 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
     private BigDecimal addressId;
 
     /**
-     * 类型：1为销售 2为内转(TYPE,DECIMAL,0)
+     * 类型：1为销售 2为内转 3为采购水运 4为采购汽运(TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="类型：1为销售 2为内转",required=false)
+    @ApiModelProperty(value="类型：1为销售 2为内转 3为采购水运 4为采购汽运",required=false)
     private BigDecimal type;
 
     private static final long serialVersionUID = 1L;
@@ -162,12 +163,12 @@ public class AmsContractTransportPrice implements IBasePO<BigDecimal> {
         this.capacityId = capacityId;
     }
 
-    public BigDecimal getMaterialId() {
+    public String getMaterialId() {
         return materialId;
     }
 
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
+    public void setMaterialId(String materialId) {
+        this.materialId = materialId == null ? null : materialId.trim();
     }
 
     public BigDecimal getPriceTonKilometer() {

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -34,10 +33,10 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private BigDecimal shipperId;
 
     /**
-     * 收货单位ID(CONSIGNEE_ID,DECIMAL,38)
+     * 收货单位ID(RECEIVE_ID,DECIMAL,38)
      */
     @ApiModelProperty(value="收货单位ID",required=false)
-    private BigDecimal consigneeId;
+    private BigDecimal receiveId;
 
     /**
      * 账户余额(SALE_ACCOUNT_BALANCE,DECIMAL,0)
@@ -173,12 +172,12 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.shipperId = shipperId;
     }
 
-    public BigDecimal getConsigneeId() {
-        return consigneeId;
+    public BigDecimal getReceiveId() {
+        return receiveId;
     }
 
-    public void setConsigneeId(BigDecimal consigneeId) {
-        this.consigneeId = consigneeId;
+    public void setReceiveId(BigDecimal receiveId) {
+        this.receiveId = receiveId;
     }
 
     public BigDecimal getSaleAccountBalance() {
@@ -311,7 +310,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", planId=").append(planId);
         sb.append(", saleNumber=").append(saleNumber);
         sb.append(", shipperId=").append(shipperId);
-        sb.append(", consigneeId=").append(consigneeId);
+        sb.append(", receiveId=").append(receiveId);
         sb.append(", saleAccountBalance=").append(saleAccountBalance);
         sb.append(", saleCurrentOrderAmount=").append(saleCurrentOrderAmount);
         sb.append(", saleHistoricalOrderAmount=").append(saleHistoricalOrderAmount);

src/main/java/com/steerinfo/dil/service/IAmsContractTransportPriceService.java

@@ -114,4 +114,6 @@ public interface IAmsContractTransportPriceService {
     int batchUpdateTransportPriceByOilPrice();
     //获取运价和吨公里数值列表
     List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
+    // 销售汽运单价
+    List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue);
 }

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

@@ -234,6 +234,16 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
         return amsContractTransportPriceMapper.getPriceValueAndPriceTonKilometer();
     }
 
+    /**
+     * 销售汽运单价
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSaleTruckPriceList(Map<String, Object> mapValue) {
+        return amsContractTransportPriceMapper.getSaleTruckPriceList(mapValue);
+    }
+
     /**
      * 修改渲染
      * @param priceId

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

@@ -45,6 +45,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         BigDecimal priceValue = amsContractTransportPrice.getPriceValue();
         //计算并插入吨公里
         BigDecimal priceTonKilometer = calculationPriceTonKilometer(lineId, priceValue);
+        amsContractTransportPrice.setType(new BigDecimal(1));
         amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
         amsContractTransportPrice.setInsertUsername("admin");
         amsContractTransportPrice.setInsertTime(new Date());
@@ -52,7 +53,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         amsContractTransportPrice.setUpdateTime(new Date());
         amsContractTransportPrice.setInsertUpdateRemark("无");
         amsContractTransportPrice.setDeleted(new BigDecimal(0));
-        return amsContractTruckPriceMapper.insert(amsContractTransportPrice);
+        return amsContractTruckPriceMapper.insertSelective(amsContractTransportPrice);
     }
 
     //计算吨公里值

src/main/resources/bootstrap.yml

@@ -14,7 +14,7 @@ spring:
 
 openfeign:
   ESFeign:
-    url: ${ESFEIGN_URL:localhost:8089}
+    url: ${ESFEIGN_URL:172.16.33.161:8089}
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 

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

@@ -6,7 +6,7 @@
     <result column="PLAN_ID" jdbcType="DECIMAL" property="planId" />
     <result column="SALE_NUMBER" jdbcType="VARCHAR" property="saleNumber" />
     <result column="SHIPPER_ID" jdbcType="DECIMAL" property="shipperId" />
-    <result column="CONSIGNEE_ID" jdbcType="DECIMAL" property="consigneeId" />
+    <result column="RECEIVE_ID" jdbcType="DECIMAL" property="receiveId" />
     <result column="SALE_ACCOUNT_BALANCE" jdbcType="DECIMAL" property="saleAccountBalance" />
     <result column="SALE_CURRENT_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleCurrentOrderAmount" />
     <result column="SALE_HISTORICAL_ORDER_AMOUNT" jdbcType="DECIMAL" property="saleHistoricalOrderAmount" />
@@ -24,13 +24,13 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
   </resultMap>
   <sql id="columns">
-    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, CONSIGNEE_ID, SALE_ACCOUNT_BALANCE, 
+    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
   </sql>
   <sql id="columns_alias">
-    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.CONSIGNEE_ID, t.SALE_ACCOUNT_BALANCE, 
+    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE, 
     t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS, 
     t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX, 
     t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
@@ -56,8 +56,8 @@
       <if test="shipperId != null">
         and SHIPPER_ID = #{shipperId}
       </if>
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
+      <if test="receiveId != null">
+        and RECEIVE_ID = #{receiveId}
       </if>
       <if test="saleAccountBalance != null">
         and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -120,8 +120,8 @@
       <if test="shipperId != null">
         and SHIPPER_ID = #{shipperId}
       </if>
-      <if test="consigneeId != null">
-        and CONSIGNEE_ID = #{consigneeId}
+      <if test="receiveId != null">
+        and RECEIVE_ID = #{receiveId}
       </if>
       <if test="saleAccountBalance != null">
         and SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -186,8 +186,8 @@
     <if test="shipperId != null">
       or SHIPPER_ID = #{shipperId}
     </if>
-    <if test="consigneeId != null">
-      or CONSIGNEE_ID = #{consigneeId}
+    <if test="receiveId != null">
+      or RECEIVE_ID = #{receiveId}
     </if>
     <if test="saleAccountBalance != null">
       or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
@@ -237,7 +237,7 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
-                                SHIPPER_ID, CONSIGNEE_ID, SALE_ACCOUNT_BALANCE,
+                                SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
                                 SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
                                 SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
                                 SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
@@ -245,7 +245,7 @@
                                 INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                 INSERT_UPDATE_REMARK, DELETED)
     values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
-            #{shipperId,jdbcType=DECIMAL}, #{consigneeId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
+            #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
             #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
             #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
             #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL},
@@ -268,8 +268,8 @@
       <if test="shipperId != null">
         SHIPPER_ID,
       </if>
-      <if test="consigneeId != null">
-        CONSIGNEE_ID,
+      <if test="receiveId != null">
+        RECEIVE_ID,
       </if>
       <if test="saleAccountBalance != null">
         SALE_ACCOUNT_BALANCE,
@@ -330,8 +330,8 @@
       <if test="shipperId != null">
         #{shipperId,jdbcType=DECIMAL},
       </if>
-      <if test="consigneeId != null">
-        #{consigneeId,jdbcType=DECIMAL},
+      <if test="receiveId != null">
+        #{receiveId,jdbcType=DECIMAL},
       </if>
       <if test="saleAccountBalance != null">
         #{saleAccountBalance,jdbcType=DECIMAL},
@@ -385,7 +385,7 @@
     set PLAN_ID = #{planId,jdbcType=DECIMAL},
         SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
         SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-        CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL},
+        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
         SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
         SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
         SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
@@ -415,8 +415,8 @@
       <if test="shipperId != null">
         SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
       </if>
-      <if test="consigneeId != null">
-        CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL},
+      <if test="receiveId != null">
+        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
       </if>
       <if test="saleAccountBalance != null">
         SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
@@ -482,7 +482,7 @@
     insert into AMS_SALE_ORDER
     (SALE_ORDER_ID,
     PLAN_ID, SALE_NUMBER, SHIPPER_ID,
-    CONSIGNEE_ID, SALE_ACCOUNT_BALANCE,
+    RECEIVE_ID, SALE_ACCOUNT_BALANCE,
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
     SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
@@ -494,7 +494,7 @@
     select
     #{item.saleOrderId,jdbcType=DECIMAL},
     #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL},
-    #{item.consigneeId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
+    #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
     #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL},
     #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR},
     #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL},
@@ -523,9 +523,9 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
       when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
     </foreach>
-    ,CONSIGNEE_ID=
+    ,RECEIVE_ID=
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
-      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
     </foreach>
     ,SALE_ACCOUNT_BALANCE=
     <foreach collection="list" item="item" index="index" separator=" " open="case SALE_ORDER_ID" close="end">
@@ -601,7 +601,6 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <select id="getSaleOrderInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -637,7 +636,7 @@
     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.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0)
     <where>
       <if test="saleNumber != null">
@@ -757,7 +756,7 @@
     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.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=1)
     <where>
       <if test="saleNumber != null">
@@ -1000,7 +999,7 @@
     select
       a_s_order.PLAN_ID "planId",
       a_s_order.SHIPPER_ID "shipperId",
-      a_s_order.CONSIGNEE_ID "consigneeId",
+      a_s_order.RECEIVE_ID "consigneeId",
       a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
       a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
       a_s_order.SALE_REMARK "saleRemark"
@@ -1011,7 +1010,7 @@
   <update id="deleteBySaleOrderId" parameterType="java.math.BigDecimal">
     update AMS_SALE_ORDER_MATERIAL set DELETED = 1 where SALE_ORDER_ID = #{saleOrderId}
   </update>
-  
+
   <select id="getAmsSaleOrderApproved" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -1049,7 +1048,7 @@
     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.CONSIGNEE_ID=r_consignee.CONSIGNEE_ID
+    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
     where a_s_order.SALE_ORDER_STATUS=4)
     <where>
       <if test="saleNumber != null">
@@ -1147,19 +1146,22 @@
   </select>
   <!-- 展示所有销售公司已审核的销售订单 -->
   <select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
-    select
-      asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
-      asom.sale_order_id as "saleOrderId",
-      asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
-      asom.sale_order_material_id,
-      rra.address_delivery_address as "addressDeliveryAddress",
-      asom.sale_date_of_receipt as "saleDateOfReceipt",
-      asom.sale_order_consignee as "saleOrderConsignee",
-      asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
+    select asom.SALE_ORDER_MATERIAL_ID          "orderMaterialId",
+           asom.sale_order_id                as "saleOrderId",
+           asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
+           asom.sale_order_material_id,
+           rra.address_delivery_address      as "addressDeliveryAddress",
+           asom.sale_date_of_receipt         as "saleDateOfReceipt",
+           asom.sale_order_consignee         as "saleOrderConsignee",
+           asom.sale_order_consignee_tel     as "saleOrderConsigneeTel"
     from ams_sale_order aso
-           join ams_sale_order_material asom on aso.sale_order_id =asom.sale_order_id
-           left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
-    where asom.sale_order_material_id not in (select adso.sale_order_material_id from ams_dispatch_sale_order adso group by adso.sale_order_material_id) and aso.sale_order_status=2 or aso.sale_order_status=4
+           join ams_sale_order_material asom on aso.sale_order_id = asom.sale_order_id
+           left join rms_receive_address rra on asom.sale_shipping_address_id = rra.address_id
+    where asom.sale_order_material_id not in (select adso.sale_order_material_id
+                                              from ams_dispatch_sale_order adso
+                                              group by adso.sale_order_material_id)
+              and aso.sale_order_status = 2
+              or aso.sale_order_status = 4
   </select>
 
   <!-- 通过收货地址，匹配对应的承运商-->

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

@@ -401,10 +401,13 @@
 
   <select id="getMaterialName" resultType="java.util.LinkedHashMap">
     select
-      MATERIAL_ID "id",
-      MATERIAL_ID "value",
-      MATERIAL_CODE "label"
+    MATERIAL_ID "id",
+    MATERIAL_ID "value",
+    MATERIAL_NAME "label"
     from RMS_MATERIAL
+    where MATERIAL_CODE like '08%'
+      and rownum &lt; 20
+
   </select>
 
   <select id="getAreaName" resultType="java.util.LinkedHashMap">

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

@@ -405,8 +405,8 @@
 
   <select id="getSalePalnIdBySaleOrderMaterialId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
     select a_s_order.PLAN_ID "planId"
-    from AMS_SALE_ORDER1 a_s_order
-           left join AMS_SALE_ORDER_MATERIAL1 order_material
+    from AMS_SALE_ORDER a_s_order
+           left join AMS_SALE_ORDER_MATERIAL order_material
                      on a_s_order.SALE_ORDER_ID=order_material.SALE_ORDER_ID
     where order_material.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId} and a_s_order.SALE_ORDER_STATUS =0
   </select>
@@ -414,9 +414,9 @@
   <select id="getAllSaleOrderMaterialNumber" parameterType="java.util.Map" resultType="java.math.BigDecimal">
     select sum(truckno_material.SALE_ORDER_MATERIAL_NUMBER) "allmaterialNumber"
     from AMS_SALE_TRUCKNO_MATERIAL truckno_material
-    left join AMS_SALE_ORDER_MATERIAL1 order_material
+    left join AMS_SALE_ORDER_MATERIAL order_material
     on truckno_material.SALE_ORDER_MATERIAL_ID=order_material.SALE_ORDER_MATERIAL_ID
-    left join AMS_SALE_ORDER1 a_s_order
+    left join AMS_SALE_ORDER a_s_order
     on a_s_order.SALE_ORDER_ID=order_material.SALE_ORDER_ID
     where a_s_order.PLAN_ID=#{planId} and truckno_material.MATERIAL_ID = #{materialId} and a_s_order.SALE_ORDER_STATUS =0
     group by