修改

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMS_SALE_MATERIAL</param>
+                        <param>OMSTRUCK_ORDER_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -92,6 +92,12 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="炉号",required=false)
     private String materialLuno;
 
+    /**
+     * 销售订单子表ID(SALE_MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="销售订单子表ID",required=false)
+    private BigDecimal saleMaterialId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -216,6 +222,14 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.materialLuno = materialLuno == null ? null : materialLuno.trim();
     }
 
+    public BigDecimal getSaleMaterialId() {
+        return saleMaterialId;
+    }
+
+    public void setSaleMaterialId(BigDecimal saleMaterialId) {
+        this.saleMaterialId = saleMaterialId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -236,6 +250,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", materialPriority=").append(materialPriority);
         sb.append(", materialMeassion=").append(materialMeassion);
         sb.append(", materialLuno=").append(materialLuno);
+        sb.append(", saleMaterialId=").append(saleMaterialId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1033,6 +1033,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 BigDecimal materialId = (BigDecimal) materialMap.get("materialId");
                 BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
                 BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
+                BigDecimal saleMaterialId = (BigDecimal) materialMap.get("saleMaterialId");
                 /*
                 运输订单物资子表
                 */
@@ -1048,6 +1049,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
                 // 物资件数
                 omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+                omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
                 // 新增运输订单子表
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
@@ -1144,6 +1146,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 BigDecimal materialId = (BigDecimal) materialMap.get("materialId");
                 BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
                 BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
+                BigDecimal saleMaterialId = (BigDecimal) materialMap.get("saleMaterialId");
                 /*
                 运输订单物资子表
                 */
@@ -1159,6 +1162,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
                 // 物资件数
                 omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
+                omstruckOrderMaterial.setSaleMaterialId(saleMaterialId);
                 // 新增运输订单子表
                 result += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }

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

@@ -921,7 +921,8 @@
   <select id="getMaterial" parameterType="DECIMAL" resultType="java.util.Map">
     SELECT ASM.MATERIAL_ID     AS "materialId",
            ASM.MATERIAL_WEIGHT AS "materialWeight",
-           ASM.MATERIAL_NUMBER AS "materialNumber"
+           ASM.MATERIAL_NUMBER AS "materialNumber",
+           ASM.SALE_MATERIAL_ID AS "saleMaterialId"
     FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
            LEFT JOIN AMS_SALE_MATERIAL ASM
                      ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID

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

@@ -16,16 +16,18 @@
     <result column="MATERIAL_PRIORITY" jdbcType="DECIMAL" property="materialPriority" />
     <result column="MATERIAL_MEASSION" jdbcType="DECIMAL" property="materialMeassion" />
     <result column="MATERIAL_LUNO" jdbcType="VARCHAR" property="materialLuno" />
+    <result column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId" />
   </resultMap>
   <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
+    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO, SALE_MATERIAL_ID
   </sql>
   <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION, t.MATERIAL_LUNO
+    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION, t.MATERIAL_LUNO,
+    t.SALE_MATERIAL_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER_MATERIAL
@@ -77,6 +79,9 @@
       <if test="materialLuno != null and materialLuno != ''">
         and MATERIAL_LUNO = #{materialLuno}
       </if>
+      <if test="saleMaterialId != null">
+        and SALE_MATERIAL_ID = #{saleMaterialId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -123,9 +128,12 @@
       <if test="materialLuno != null and materialLuno != ''">
         and MATERIAL_LUNO LIKE '%${materialLuno}%'
       </if>
+      <if test="saleMaterialId != null">
+        and SALE_MATERIAL_ID = #{saleMaterialId}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -171,20 +179,23 @@
     <if test="materialLuno != null and materialLuno != ''">
       or MATERIAL_LUNO = #{materialLuno}
     </if>
+    <if test="saleMaterialId != null">
+      or SALE_MATERIAL_ID = #{saleMaterialId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
                                          ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                          UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION,
-                                         MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
-    )
+                                         MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO,
+                                         SALE_MATERIAL_ID)
     values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
             #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
             #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL},
-            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL}, #{materialLuno,jdbcType=VARCHAR}
-           )
+            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL}, #{materialLuno,jdbcType=VARCHAR},
+            #{saleMaterialId,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -231,6 +242,9 @@
       <if test="materialLuno != null">
         MATERIAL_LUNO,
       </if>
+      <if test="saleMaterialId != null">
+        SALE_MATERIAL_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -275,6 +289,9 @@
       <if test="materialLuno != null">
         #{materialLuno,jdbcType=VARCHAR},
       </if>
+      <if test="saleMaterialId != null">
+        #{saleMaterialId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -291,7 +308,8 @@
         MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
         MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
         MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
-        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR}
+        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR},
+        SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -336,10 +354,13 @@
       <if test="materialLuno != null">
         MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR},
       </if>
+      <if test="saleMaterialId != null">
+        SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>
@@ -359,8 +380,8 @@
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     MATERIAL_DIRECTION, MATERIAL_PRIORITY,
-    MATERIAL_MEASSION, MATERIAL_LUNO
-    )
+    MATERIAL_MEASSION, MATERIAL_LUNO,
+    SALE_MATERIAL_ID)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.orderMaterialId,jdbcType=DECIMAL},
@@ -369,8 +390,8 @@
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL},
-    #{item.materialMeassion,jdbcType=DECIMAL}, #{item.materialLuno,jdbcType=VARCHAR}
-    from dual
+    #{item.materialMeassion,jdbcType=DECIMAL}, #{item.materialLuno,jdbcType=VARCHAR},
+    #{item.saleMaterialId,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -432,13 +453,16 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialLuno,jdbcType=VARCHAR}
     </foreach>
+    ,SALE_MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.saleMaterialId,jdbcType=DECIMAL}
+    </foreach>
     where ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
-
-    <delete id="batchDelete" parameterType="java.util.List">
+  <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
@@ -449,6 +473,8 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <select id="getMaterialList" parameterType="DECIMAL" resultType="java.util.Map">
     SELECT OOM.MATERIAL_ID           "materialId",