修改运价

pom.xml

@@ -115,9 +115,9 @@
 <!--                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMSTRUCK_RAIL_DAYPLAN</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_ORDER_MATERIAL</param><!--销售订单车序号表-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
-                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>
+<!--                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -34,9 +34,9 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
     private BigDecimal saleShippingAddressId;
 
     /**
-     * 发货日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
+     * 截止日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="发货日期",required=false)
+    @ApiModelProperty(value="截止日期",required=false)
     private Date saleDateOfReceipt;
 
     /**
@@ -105,6 +105,12 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="钢材收货日期",required=false)
     private Date steelReceiptDate;
 
+    /**
+     * 运输单价ID(PRICE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输单价ID",required=false)
+    private BigDecimal priceId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -245,6 +251,14 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
         this.steelReceiptDate = steelReceiptDate;
     }
 
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -267,6 +281,7 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", updated=").append(updated);
         sb.append(", issueStatus=").append(issueStatus);
         sb.append(", steelReceiptDate=").append(steelReceiptDate);
+        sb.append(", priceId=").append(priceId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -229,6 +229,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 if (orderConsignee != null) {
                     amsSaleOrderMaterial.setSaleOrderConsigneeTel(orderConsigneeTel.toString());
                 }
+                Object priceId = map.get("priceId");
+                if(priceId != null && !"".equals(priceId)) amsSaleOrderMaterial.setPriceId(DataChange.dataToBigDecimal(priceId));
                 amsSaleOrderMaterial.setInsertTime(new Date());
                 amsSaleOrderMaterial.setInsertUsername("admin");
                 amsSaleOrderMaterial.setDeleted(new BigDecimal(0));

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

@@ -18,18 +18,19 @@
     <result column="UPDATED" jdbcType="DECIMAL" property="updated" />
     <result column="ISSUE_STATUS" jdbcType="DECIMAL" property="issueStatus" />
     <result column="STEEL_RECEIPT_DATE" jdbcType="TIMESTAMP" property="steelReceiptDate" />
+    <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
   </resultMap>
   <sql id="columns">
     SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID, SALE_ORDER_MATERIAL_TRUCK_NO, SALE_SHIPPING_ADDRESS_ID, 
     SALE_DATE_OF_RECEIPT, SALE_ORDER_CONSIGNEE, SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, UPDATED, 
-    ISSUE_STATUS, STEEL_RECEIPT_DATE
+    ISSUE_STATUS, STEEL_RECEIPT_DATE, PRICE_ID
   </sql>
   <sql id="columns_alias">
     t.SALE_ORDER_MATERIAL_ID, t.SALE_ORDER_ID, t.SALE_ORDER_MATERIAL_TRUCK_NO, t.SALE_SHIPPING_ADDRESS_ID, 
     t.SALE_DATE_OF_RECEIPT, t.SALE_ORDER_CONSIGNEE, t.SALE_ORDER_CONSIGNEE_TEL, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.UPDATED, t.ISSUE_STATUS, t.STEEL_RECEIPT_DATE
+    t.UPDATED, t.ISSUE_STATUS, t.STEEL_RECEIPT_DATE, t.PRICE_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_MATERIAL
@@ -38,7 +39,7 @@
     SELECT <include refid="columns_alias" /> FROM AMS_SALE_ORDER_MATERIAL t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="saleOrderMaterialId != null">
         and SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
       </if>
@@ -87,10 +88,13 @@
       <if test="steelReceiptDate != null">
         and TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = #{steelReceiptDate}
       </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="saleOrderMaterialId != null">
         and SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
       </if>
@@ -139,76 +143,84 @@
       <if test="steelReceiptDate != null">
         and TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = #{steelReceiptDate}
       </if>
+      <if test="priceId != null">
+        and PRICE_ID = #{priceId}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
     delete from AMS_SALE_ORDER_MATERIAL
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMS_SALE_ORDER_MATERIAL
-    where 1!=1 
-      <if test="saleOrderId != null">
-        or SALE_ORDER_ID = #{saleOrderId}
-      </if>
-      <if test="saleOrderMaterialTruckNo != null">
-        or SALE_ORDER_MATERIAL_TRUCK_NO = #{saleOrderMaterialTruckNo}
-      </if>
-      <if test="saleShippingAddressId != null">
-        or SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId}
-      </if>
-      <if test="saleDateOfReceipt != null">
-        or TO_CHAR(SALE_DATE_OF_RECEIPT,'yyyy-MM-dd') = '#{saleDateOfReceipt}'
-      </if>
-      <if test="saleOrderConsignee != null and saleOrderConsignee != ''">
-        or SALE_ORDER_CONSIGNEE = #{saleOrderConsignee}
-      </if>
-      <if test="saleOrderConsigneeTel != null and saleOrderConsigneeTel != ''">
-        or SALE_ORDER_CONSIGNEE_TEL = #{saleOrderConsigneeTel}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="updated != null">
-        or UPDATED = #{updated}
-      </if>
-      <if test="issueStatus != null">
-        or ISSUE_STATUS = #{issueStatus}
-      </if>
-      <if test="steelReceiptDate != null">
-        or TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = '#{steelReceiptDate}'
-      </if>
+    where 1!=1
+    <if test="saleOrderId != null">
+      or SALE_ORDER_ID = #{saleOrderId}
+    </if>
+    <if test="saleOrderMaterialTruckNo != null">
+      or SALE_ORDER_MATERIAL_TRUCK_NO = #{saleOrderMaterialTruckNo}
+    </if>
+    <if test="saleShippingAddressId != null">
+      or SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId}
+    </if>
+    <if test="saleDateOfReceipt != null">
+      or TO_CHAR(SALE_DATE_OF_RECEIPT,'yyyy-MM-dd') = '#{saleDateOfReceipt}'
+    </if>
+    <if test="saleOrderConsignee != null and saleOrderConsignee != ''">
+      or SALE_ORDER_CONSIGNEE = #{saleOrderConsignee}
+    </if>
+    <if test="saleOrderConsigneeTel != null and saleOrderConsigneeTel != ''">
+      or SALE_ORDER_CONSIGNEE_TEL = #{saleOrderConsigneeTel}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="updated != null">
+      or UPDATED = #{updated}
+    </if>
+    <if test="issueStatus != null">
+      or ISSUE_STATUS = #{issueStatus}
+    </if>
+    <if test="steelReceiptDate != null">
+      or TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = '#{steelReceiptDate}'
+    </if>
+    <if test="priceId != null">
+      or PRICE_ID = #{priceId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
-    insert into AMS_SALE_ORDER_MATERIAL (SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID, 
-      SALE_ORDER_MATERIAL_TRUCK_NO, SALE_SHIPPING_ADDRESS_ID, 
-      SALE_DATE_OF_RECEIPT, SALE_ORDER_CONSIGNEE, 
-      SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, UPDATED, 
-      ISSUE_STATUS, STEEL_RECEIPT_DATE)
-    values (#{saleOrderMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, 
-      #{saleOrderMaterialTruckNo,jdbcType=DECIMAL}, #{saleShippingAddressId,jdbcType=DECIMAL}, 
-      #{saleDateOfReceipt,jdbcType=TIMESTAMP}, #{saleOrderConsignee,jdbcType=VARCHAR}, 
-      #{saleOrderConsigneeTel,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{updated,jdbcType=DECIMAL}, 
-      #{issueStatus,jdbcType=DECIMAL}, #{steelReceiptDate,jdbcType=TIMESTAMP})
+    insert into AMS_SALE_ORDER_MATERIAL (SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID,
+                                         SALE_ORDER_MATERIAL_TRUCK_NO, SALE_SHIPPING_ADDRESS_ID,
+                                         SALE_DATE_OF_RECEIPT, SALE_ORDER_CONSIGNEE,
+                                         SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME,
+                                         INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                         INSERT_UPDATE_REMARK, DELETED, UPDATED,
+                                         ISSUE_STATUS, STEEL_RECEIPT_DATE, PRICE_ID
+    )
+    values (#{saleOrderMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL},
+            #{saleOrderMaterialTruckNo,jdbcType=DECIMAL}, #{saleShippingAddressId,jdbcType=DECIMAL},
+            #{saleDateOfReceipt,jdbcType=TIMESTAMP}, #{saleOrderConsignee,jdbcType=VARCHAR},
+            #{saleOrderConsigneeTel,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{updated,jdbcType=DECIMAL},
+            #{issueStatus,jdbcType=DECIMAL}, #{steelReceiptDate,jdbcType=TIMESTAMP}, #{priceId,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
     insert into AMS_SALE_ORDER_MATERIAL
@@ -261,6 +273,9 @@
       <if test="steelReceiptDate != null">
         STEEL_RECEIPT_DATE,
       </if>
+      <if test="priceId != null">
+        PRICE_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderMaterialId != null">
@@ -311,25 +326,29 @@
       <if test="steelReceiptDate != null">
         #{steelReceiptDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="priceId != null">
+        #{priceId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
     update AMS_SALE_ORDER_MATERIAL
     set SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL},
-      SALE_ORDER_MATERIAL_TRUCK_NO = #{saleOrderMaterialTruckNo,jdbcType=DECIMAL},
-      SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId,jdbcType=DECIMAL},
-      SALE_DATE_OF_RECEIPT = #{saleDateOfReceipt,jdbcType=TIMESTAMP},
-      SALE_ORDER_CONSIGNEE = #{saleOrderConsignee,jdbcType=VARCHAR},
-      SALE_ORDER_CONSIGNEE_TEL = #{saleOrderConsigneeTel,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      UPDATED = #{updated,jdbcType=DECIMAL},
-      ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
-      STEEL_RECEIPT_DATE = #{steelReceiptDate,jdbcType=TIMESTAMP}
+        SALE_ORDER_MATERIAL_TRUCK_NO = #{saleOrderMaterialTruckNo,jdbcType=DECIMAL},
+        SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId,jdbcType=DECIMAL},
+        SALE_DATE_OF_RECEIPT = #{saleDateOfReceipt,jdbcType=TIMESTAMP},
+        SALE_ORDER_CONSIGNEE = #{saleOrderConsignee,jdbcType=VARCHAR},
+        SALE_ORDER_CONSIGNEE_TEL = #{saleOrderConsigneeTel,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        UPDATED = #{updated,jdbcType=DECIMAL},
+        ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
+        STEEL_RECEIPT_DATE = #{steelReceiptDate,jdbcType=TIMESTAMP},
+        PRICE_ID = #{priceId,jdbcType=DECIMAL}
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
@@ -380,10 +399,13 @@
       <if test="steelReceiptDate != null">
         STEEL_RECEIPT_DATE = #{steelReceiptDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="priceId != null">
+        PRICE_ID = #{priceId,jdbcType=DECIMAL},
+      </if>
     </set>
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </select>
@@ -396,104 +418,108 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMS_SALE_ORDER_MATERIAL 
-      (SALE_ORDER_MATERIAL_ID, 
-      SALE_ORDER_ID, SALE_ORDER_MATERIAL_TRUCK_NO, 
-      SALE_SHIPPING_ADDRESS_ID, SALE_DATE_OF_RECEIPT, 
-      SALE_ORDER_CONSIGNEE, SALE_ORDER_CONSIGNEE_TEL, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, 
-      UPDATED, ISSUE_STATUS, STEEL_RECEIPT_DATE
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.saleOrderMaterialId,jdbcType=DECIMAL}, 
-      #{item.saleOrderId,jdbcType=DECIMAL}, #{item.saleOrderMaterialTruckNo,jdbcType=DECIMAL}, 
-      #{item.saleShippingAddressId,jdbcType=DECIMAL}, #{item.saleDateOfReceipt,jdbcType=TIMESTAMP}, 
-      #{item.saleOrderConsignee,jdbcType=VARCHAR}, #{item.saleOrderConsigneeTel,jdbcType=VARCHAR}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, 
-      #{item.updated,jdbcType=DECIMAL}, #{item.issueStatus,jdbcType=DECIMAL}, #{item.steelReceiptDate,jdbcType=TIMESTAMP}
-       from dual  
-   </foreach> )
+    insert into AMS_SALE_ORDER_MATERIAL
+    (SALE_ORDER_MATERIAL_ID,
+    SALE_ORDER_ID, SALE_ORDER_MATERIAL_TRUCK_NO,
+    SALE_SHIPPING_ADDRESS_ID, SALE_DATE_OF_RECEIPT,
+    SALE_ORDER_CONSIGNEE, SALE_ORDER_CONSIGNEE_TEL,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    UPDATED, ISSUE_STATUS, STEEL_RECEIPT_DATE,
+    PRICE_ID)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.saleOrderMaterialId,jdbcType=DECIMAL},
+    #{item.saleOrderId,jdbcType=DECIMAL}, #{item.saleOrderMaterialTruckNo,jdbcType=DECIMAL},
+    #{item.saleShippingAddressId,jdbcType=DECIMAL}, #{item.saleDateOfReceipt,jdbcType=TIMESTAMP},
+    #{item.saleOrderConsignee,jdbcType=VARCHAR}, #{item.saleOrderConsigneeTel,jdbcType=VARCHAR},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.updated,jdbcType=DECIMAL}, #{item.issueStatus,jdbcType=DECIMAL}, #{item.steelReceiptDate,jdbcType=TIMESTAMP},
+    #{item.priceId,jdbcType=DECIMAL} from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMS_SALE_ORDER_MATERIAL
-     set
-       SALE_ORDER_MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderMaterialId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_MATERIAL_TRUCK_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderMaterialTruckNo,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_SHIPPING_ADDRESS_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleShippingAddressId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_DATE_OF_RECEIPT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleDateOfReceipt,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SALE_ORDER_CONSIGNEE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderConsignee,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_ORDER_CONSIGNEE_TEL=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderConsigneeTel,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,UPDATED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updated,jdbcType=DECIMAL}
-       </foreach>
-       ,ISSUE_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.issueStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,STEEL_RECEIPT_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
-          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.steelReceiptDate,jdbcType=TIMESTAMP}
-       </foreach>
-     where SALE_ORDER_MATERIAL_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.saleOrderMaterialId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMS_SALE_ORDER_MATERIAL
+    set
+    SALE_ORDER_MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderMaterialId,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ORDER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ORDER_MATERIAL_TRUCK_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderMaterialTruckNo,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_SHIPPING_ADDRESS_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleShippingAddressId,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_DATE_OF_RECEIPT=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleDateOfReceipt,jdbcType=TIMESTAMP}
+    </foreach>
+    ,SALE_ORDER_CONSIGNEE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderConsignee,jdbcType=VARCHAR}
+    </foreach>
+    ,SALE_ORDER_CONSIGNEE_TEL=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.saleOrderConsigneeTel,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,UPDATED=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.updated,jdbcType=DECIMAL}
+    </foreach>
+    ,ISSUE_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.issueStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,STEEL_RECEIPT_DATE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.steelReceiptDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,PRICE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+      when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+    </foreach>
+    where SALE_ORDER_MATERIAL_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.saleOrderMaterialId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMS_SALE_ORDER_MATERIAL
-    where SALE_ORDER_MATERIAL_ID in 
+    where SALE_ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>