辅材申请新增接收一下所属区域字段areaName

src/main/java/com/starcharge/wios/dao/entity/Tauxiliarymaterials.java

@@ -321,6 +321,13 @@ public class Tauxiliarymaterials  extends PageVo implements Serializable{
      */
      */
     @ApiModelProperty(value = "发货人")
     @ApiModelProperty(value = "发货人")
     private String sender;
     private String sender;
+    /**
+     * 所属区域
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "所属区域")
+    private String areaName;
 
 
 
 
 }
 }
\ No newline at end of file

src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.xml

@@ -33,6 +33,7 @@
     <result column="apply_inventory" jdbcType="VARCHAR" property="applyInventory" />
     <result column="apply_inventory" jdbcType="VARCHAR" property="applyInventory" />
     <result column="apply_order" jdbcType="VARCHAR" property="applyOrder" />
     <result column="apply_order" jdbcType="VARCHAR" property="applyOrder" />
     <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
     <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+    <result column="area_name" jdbcType="VARCHAR" property="areaName" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <where>
     <where>
@@ -98,7 +99,7 @@
     receiving_status, recipents, receive_address, receive_phone, apply_time, check_user, 
     receiving_status, recipents, receive_address, receive_phone, apply_time, check_user, 
     check_user_name, check_time, check_suggestion, CREATED_BY, CREATED_TIME, UPDATED_BY, 
     check_user_name, check_time, check_suggestion, CREATED_BY, CREATED_TIME, UPDATED_BY, 
     UPDATED_TIME, install_order, specification, logistic_order, apply_inventory, apply_order, 
     UPDATED_TIME, install_order, specification, logistic_order, apply_inventory, apply_order, 
-    warehouse_id
+    warehouse_id,area_name
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultMap="BaseResultMap">
     select
     select
@@ -253,6 +254,9 @@
       <if test="warehouseId != null">
       <if test="warehouseId != null">
         warehouse_id,
         warehouse_id,
       </if>
       </if>
+      <if test="areaName != null">
+        area_name,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="materialCode != null">
       <if test="materialCode != null">
@@ -345,6 +349,9 @@
       <if test="warehouseId != null">
       <if test="warehouseId != null">
         #{warehouseId,jdbcType=VARCHAR},
         #{warehouseId,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="areaName != null">
+        #{areaName,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultType="java.lang.Long">
   <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria" resultType="java.lang.Long">
@@ -629,7 +636,7 @@
     select t.id, t.material_code, t.material_name, t.measurement_unit, t.apply_quantity, t.approved_quantity, t.currenty_sap,
     select t.id, t.material_code, t.material_name, t.measurement_unit, t.apply_quantity, t.approved_quantity, t.currenty_sap,
     t.month_amount_sap, t.year_amount, t.apply_status, t.team, t.logistic_status, t.receiving_status, t.recipents,
     t.month_amount_sap, t.year_amount, t.apply_status, t.team, t.logistic_status, t.receiving_status, t.recipents,
     t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
     t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
-    t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,
+    t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,t.area_name,
     t.apply_inventory, t.apply_order,ts.id supplierId,td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender
     t.apply_inventory, t.apply_order,ts.id supplierId,td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender
     from t_auxiliary_materials t
     from t_auxiliary_materials t
         left join t_delivery td on td.install_order = t.apply_order
         left join t_delivery td on td.install_order = t.apply_order

src/main/java/com/starcharge/wios/vo/TauxiliarymaterialsVo.java

@@ -156,4 +156,11 @@ public class TauxiliarymaterialsVo {
     @NotEmpty(groups = {CreateEntityGroup.class})
     @NotEmpty(groups = {CreateEntityGroup.class})
     @NotNull(groups = {CreateEntityGroup.class})
     @NotNull(groups = {CreateEntityGroup.class})
     private String warehouseId;
     private String warehouseId;
+    /**
+     * 所属区域
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "所属区域")
+    private String areaName;
 }
 }