'master'

pom.xml

@@ -194,7 +194,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>AMS_PURCHASE_ORDER</table>
+                        <table>AMS_SALE_MATERIAL</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -81,6 +81,12 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除 0:未删除 ；1：已删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 仓库所在厂区(SALE_WAREHOUSE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="仓库所在厂区",required=false)
+    private String saleWarehouse;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -189,6 +195,14 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getSaleWarehouse() {
+        return saleWarehouse;
+    }
+
+    public void setSaleWarehouse(String saleWarehouse) {
+        this.saleWarehouse = saleWarehouse == null ? null : saleWarehouse.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -207,6 +221,7 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", saleWarehouse=").append(saleWarehouse);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -175,6 +175,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     BigDecimal saleMaterialId = amsSaleMaterialMapper.getSaleMaterialId();
                     amsSaleMaterial.setSaleMaterialId(saleMaterialId);
                     amsSaleMaterial.setSaleOrderId(saleOrderId);
+                    // 仓库编码
+                    Object warehouseNum = materialMap.get("warehouseNum");
+                    // 仓库名称
+                    Object warehouseName = materialMap.get("warehouseName");
+                    if (warehouseName != null) {
+                        amsSaleMaterial.setSaleWarehouse(warehouseName.toString());
+                    }
                     // 得到物资编码
                     String materialCode = (String) materialMap.get("materialCode");
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);

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

@@ -2,38 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.AmsSaleMaterialMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsSaleMaterial">
-        <id column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId"/>
-        <result column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId"/>
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="MATERIAL_WEIGHT" jdbcType="DECIMAL" property="materialWeight"/>
-        <result column="MATERIAL_NUMBER" jdbcType="DECIMAL" property="materialNumber"/>
-        <result column="EAS_PRIMARY_ID" jdbcType="VARCHAR" property="easPrimaryId"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <id column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId" />
+        <result column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="MATERIAL_WEIGHT" jdbcType="DECIMAL" property="materialWeight" />
+        <result column="MATERIAL_NUMBER" jdbcType="DECIMAL" property="materialNumber" />
+        <result column="EAS_PRIMARY_ID" jdbcType="VARCHAR" property="easPrimaryId" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="SALE_WAREHOUSE" jdbcType="VARCHAR" property="saleWarehouse" />
     </resultMap>
     <sql id="columns">
         SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETED
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED, SALE_WAREHOUSE
     </sql>
     <sql id="columns_alias">
         t.SALE_MATERIAL_ID, t.SALE_ORDER_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_NUMBER,
-    t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED
+    t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.SALE_WAREHOUSE
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM AMS_SALE_MATERIAL
+        SELECT <include refid="columns" /> FROM AMS_SALE_MATERIAL
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM AMS_SALE_MATERIAL t
+        SELECT <include refid="columns_alias" /> FROM AMS_SALE_MATERIAL t
     </sql>
     <sql id="where">
         <where>
@@ -73,6 +70,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="saleWarehouse != null and saleWarehouse != ''">
+                and SALE_WAREHOUSE = #{saleWarehouse}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -113,11 +113,13 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="saleWarehouse != null and saleWarehouse != ''">
+                and SALE_WAREHOUSE LIKE '%${saleWarehouse}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from AMS_SALE_MATERIAL
+        delete from AMS_SALE_MATERIAL
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -156,18 +158,21 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="saleWarehouse != null and saleWarehouse != ''">
+            or SALE_WAREHOUSE = #{saleWarehouse}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL (SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID,
                                        MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
                                        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                       UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
+                                       UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                       SALE_WAREHOUSE)
         values (#{saleMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
-                #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL},
-                #{easPrimaryId,jdbcType=VARCHAR},
-                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+                #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL}, #{easPrimaryId,jdbcType=VARCHAR},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{saleWarehouse,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL
@@ -208,6 +213,9 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="saleWarehouse != null">
+                SALE_WAREHOUSE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saleMaterialId != null">
@@ -246,21 +254,25 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="saleWarehouse != null">
+                #{saleWarehouse,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         update AMS_SALE_MATERIAL
-        set SALE_ORDER_ID        = #{saleOrderId,jdbcType=DECIMAL},
-            MATERIAL_ID          = #{materialId,jdbcType=DECIMAL},
-            MATERIAL_WEIGHT      = #{materialWeight,jdbcType=DECIMAL},
-            MATERIAL_NUMBER      = #{materialNumber,jdbcType=DECIMAL},
-            EAS_PRIMARY_ID       = #{easPrimaryId,jdbcType=VARCHAR},
-            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+        set SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            MATERIAL_WEIGHT = #{materialWeight,jdbcType=DECIMAL},
+            MATERIAL_NUMBER = #{materialNumber,jdbcType=DECIMAL},
+            EAS_PRIMARY_ID = #{easPrimaryId,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}
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR}
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -299,20 +311,23 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="saleWarehouse != null">
+                SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR},
+            </if>
         </set>
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where SALE_MATERIAL_ID = #{saleMaterialId,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 AMS_SALE_MATERIAL
@@ -321,16 +336,17 @@
         MATERIAL_NUMBER, EAS_PRIMARY_ID,
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
+        INSERT_UPDATE_REMARK, DELETED,
+        SALE_WAREHOUSE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.saleMaterialId,jdbcType=DECIMAL},
-        #{item.saleOrderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
-        #{item.materialWeight,jdbcType=DECIMAL},
+        #{item.saleOrderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.materialWeight,jdbcType=DECIMAL},
         #{item.materialNumber,jdbcType=DECIMAL}, #{item.easPrimaryId,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} from dual
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.saleWarehouse,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -384,6 +400,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
             when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,SALE_WAREHOUSE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.saleWarehouse,jdbcType=VARCHAR}
+        </foreach>
         where SALE_MATERIAL_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.saleMaterialId,jdbcType=DECIMAL}