出库结算管理-新增备注字段

pom.xml

@@ -126,6 +126,13 @@
 		    <groupId>org.springframework.cloud</groupId>
 		    <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
 		</dependency>
+		<!-- lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.22</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/depot/device/mapper/StorageJsglMapper.xml

@@ -34,6 +34,7 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="ywlx" jdbcType="VARCHAR" property="ywlx" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chinaitop.depot.device.model.StorageJsgl">
     <result column="fp_text" jdbcType="LONGVARCHAR" property="fpText" />
@@ -99,7 +100,7 @@
   <sql id="Base_Column_List">
     id, org_id, data_status, jslx, htid, htbh, htzsl, yjssl, house_id, warehouse_id, 
     lypz, mxpz, lyxz, bcjssl, bcjsdj, bcjsje, bcjssj, bcjsfs, fp_start, fp_end, fps, 
-    fpzt, customer_id, sfkr, khhmc, khhh, yhzh, skrsfzh, fkdw, create_time, update_time, ywlx
+    fpzt, customer_id, sfkr, khhmc, khhh, yhzh, skrsfzh, fkdw, create_time, update_time, ywlx,remarks
   </sql>
   <sql id="Blob_Column_List">
     fp_text
@@ -162,7 +163,7 @@
       fps, fpzt, customer_id, 
       sfkr, khhmc, khhh, 
       yhzh, skrsfzh, fkdw, 
-      create_time, update_time, fp_text, ywlx
+      create_time, update_time, fp_text, ywlx,remarks
       )
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{dataStatus,jdbcType=VARCHAR}, 
       #{jslx,jdbcType=VARCHAR}, #{htid,jdbcType=VARCHAR}, #{htbh,jdbcType=VARCHAR}, #{htzsl,jdbcType=DECIMAL}, 
@@ -174,7 +175,7 @@
       #{sfkr,jdbcType=VARCHAR}, #{khhmc,jdbcType=VARCHAR}, #{khhh,jdbcType=VARCHAR}, 
       #{yhzh,jdbcType=VARCHAR}, #{skrsfzh,jdbcType=VARCHAR}, #{fkdw,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{fpText,jdbcType=LONGVARCHAR},
-      #{ywlx,jdbcType=VARCHAR}
+      #{ywlx,jdbcType=VARCHAR},#{remarks,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageJsgl">
@@ -279,6 +280,9 @@
       <if test="ywlx != null">
         ywlx,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -380,6 +384,9 @@
       <if test="ywlx != null">
         #{ywlx,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageJsglExample" resultType="java.lang.Integer">
@@ -490,6 +497,9 @@
       <if test="record.ywlx != null">
         ywlx = #{record.ywlx,jdbcType=VARCHAR},
       </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -529,7 +539,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       fp_text = #{record.fpText,jdbcType=LONGVARCHAR},
-      ywlx = #{record.ywlx,jdbcType=VARCHAR}
+      ywlx = #{record.ywlx,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -567,7 +578,8 @@
       fkdw = #{record.fkdw,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      ywlx = #{record.ywlx,jdbcType=VARCHAR}
+      ywlx = #{record.ywlx,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -671,6 +683,9 @@
       <if test="ywlx != null">
         ywlx = #{ywlx,jdbcType=VARCHAR},
       </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -707,7 +722,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       fp_text = #{fpText,jdbcType=LONGVARCHAR},
-      ywlx = #{ywlx,jdbcType=VARCHAR}
+      ywlx = #{ywlx,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageJsgl">
@@ -742,7 +758,8 @@
       fkdw = #{fkdw,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      ywlx = #{ywlx,jdbcType=VARCHAR}
+      ywlx = #{ywlx,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

src/main/java/com/chinaitop/depot/device/model/StorageJsgl.java

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
 
 public class StorageJsgl {
     private String id;
@@ -74,6 +76,9 @@ public class StorageJsgl {
     private Date updateTime;
 
     private String fpText;
+    // 备注
+    @Getter @Setter
+    private String remarks;
 
     /**
      * 主键唯一ID