加工单 新增实际备注

common/src/main/java/com/jpsoft/printing/modules/base/entity/Work.java

@@ -43,6 +43,8 @@ public class Work {
     private String colour;
         @ApiModelProperty(value = "应交成品数")
     private BigDecimal estimateQuantity;
+    @ApiModelProperty(value = "应交成品数备注")
+    private String estimateRemark;
         @ApiModelProperty(value = "单价（元/米）")
     private BigDecimal unitPrice;
         @ApiModelProperty(value = "原因")

common/src/main/resources/mapper/base/Work.xml

@@ -16,6 +16,7 @@
 		<result property="ratio" column="ratio_" />
 		<result property="colour" column="colour_" />
 		<result property="estimateQuantity" column="estimate_quantity" />
+		<result property="estimateRemark" column="estimate_remark" />
 		<result property="unitPrice" column="unit_price" />
 		<result property="reason" column="reason_" />
 		<result property="clothPrice" column="cloth_price" />
@@ -37,7 +38,7 @@
 	-->
 	<![CDATA[
 		insert into base_work
-	    (id_,customer_id,name_,width_,number_,process_date,process_volume,process_remark,process_number,ratio_,colour_,estimate_quantity,unit_price,reason_,cloth_price,wages_,roll_length,remark_,status_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,customer_id,name_,width_,number_,process_date,process_volume,process_remark,process_number,ratio_,colour_,estimate_quantity,estimate_remark,unit_price,reason_,cloth_price,wages_,roll_length,remark_,status_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -52,6 +53,7 @@
 ,#{ratio,jdbcType= NUMERIC }
 ,#{colour,jdbcType=VARCHAR}
 ,#{estimateQuantity,jdbcType= NUMERIC }
+,#{estimateRemark,jdbcType= VARCHAR }
 ,#{unitPrice,jdbcType= NUMERIC }
 ,#{reason,jdbcType=VARCHAR}
 ,#{clothPrice,jdbcType= NUMERIC }
@@ -105,6 +107,9 @@
 		</if>
 				<if test="estimateQuantity!=null">
 		estimate_quantity=#{estimateQuantity,jdbcType= NUMERIC },
+		</if>
+				<if test="estimateRemark!=null">
+		estimate_remark=#{estimateRemark,jdbcType= VARCHAR },
 		</if>
 				<if test="unitPrice!=null">
 		unit_price=#{unitPrice,jdbcType= NUMERIC },
@@ -147,7 +152,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="WorkMap">
 		select 
-id_,customer_id,name_,width_,number_,process_date,process_volume,process_remark,process_number,ratio_,colour_,estimate_quantity,unit_price,reason_,cloth_price,wages_,roll_length,remark_,status_,del_flag,create_by,create_time,update_by,update_time		from base_work where id_=#{0}
+id_,customer_id,name_,width_,number_,process_date,process_volume,process_remark,process_number,ratio_,colour_,estimate_quantity,estimate_remark,unit_price,reason_,cloth_price,wages_,roll_length,remark_,status_,del_flag,create_by,create_time,update_by,update_time		from base_work where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_work where id_=#{0}