加工单新加入字段

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

@@ -32,20 +32,24 @@ public class Work {
 	    @ApiModelProperty(value = "投坯日")
     private Date processDate;
         @ApiModelProperty(value = "投坯数")
-    private String processVolume;
+    private Integer processVolume;
+        @ApiModelProperty(value = "投坯数备注")
+    private String processRemark;
+        @ApiModelProperty(value = "投坯卷数")
+    private Integer processNumber;
         @ApiModelProperty(value = "伸长率")
     private BigDecimal ratio;
         @ApiModelProperty(value = "色泽")
     private String colour;
         @ApiModelProperty(value = "应交成品数")
     private BigDecimal estimateQuantity;
-        @ApiModelProperty(value = "单价")
+        @ApiModelProperty(value = "单价（元/米）")
     private BigDecimal unitPrice;
         @ApiModelProperty(value = "原因")
     private String reason;
-        @ApiModelProperty(value = "坯布价")
+        @ApiModelProperty(value = "坯布价（元/米）")
     private BigDecimal clothPrice;
-        @ApiModelProperty(value = "力资")
+        @ApiModelProperty(value = "力资（元/卷）")
     private BigDecimal wages;
         @ApiModelProperty(value = "备注")
     private String remark;

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

@@ -5,26 +5,28 @@
 <mapper namespace="com.jpsoft.printing.modules.base.dao.WorkDAO">
 	<resultMap id="WorkMap" type="com.jpsoft.printing.modules.base.entity.Work">
 		<id property="id" column="id_" />
-		<result property="customerId" column="customer_id" />
-		<result property="name" column="name_" />
-		<result property="width" column="width_" />
-		<result property="number" column="number_" />
-		<result property="processDate" column="process_date" />
-		<result property="processVolume" column="process_volume" />
-		<result property="ratio" column="ratio_" />
-		<result property="colour" column="colour_" />
-		<result property="estimateQuantity" column="estimate_quantity" />
-		<result property="unitPrice" column="unit_price" />
-		<result property="reason" column="reason_" />
-		<result property="clothPrice" column="cloth_price" />
-		<result property="wages" column="wages_" />
-		<result property="remark" column="remark_" />
-		<result property="delFlag" column="del_flag" />
-		<result property="createBy" column="create_by" />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy" column="update_by" />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
+			<result property="customerId" column="customer_id" />
+			<result property="name" column="name_" />
+			<result property="width" column="width_" />
+			<result property="number" column="number_" />
+			<result property="processDate" column="process_date" />
+			<result property="processVolume" column="process_volume" />
+			<result property="processRemark" column="process_remark" />
+			<result property="processNumber" column="process_number" />
+			<result property="ratio" column="ratio_" />
+			<result property="colour" column="colour_" />
+			<result property="estimateQuantity" column="estimate_quantity" />
+			<result property="unitPrice" column="unit_price" />
+			<result property="reason" column="reason_" />
+			<result property="clothPrice" column="cloth_price" />
+			<result property="wages" column="wages_" />
+			<result property="remark" column="remark_" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.printing.modules.base.entity.Work">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -33,7 +35,7 @@
 	-->
 	<![CDATA[
 		insert into base_work
-	    (id_,customer_id,name_,width_,number_,process_date,process_volume,ratio_,colour_,estimate_quantity,unit_price,reason_,cloth_price,wages_,remark_,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,unit_price,reason_,cloth_price,wages_,remark_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -42,7 +44,9 @@
 ,#{width,jdbcType= NUMERIC }
 ,#{number,jdbcType=VARCHAR}
 ,#{processDate,jdbcType= TIMESTAMP }
-,#{processVolume,jdbcType=VARCHAR}
+,#{processVolume,jdbcType= NUMERIC }
+,#{processRemark,jdbcType=VARCHAR}
+,#{processNumber,jdbcType= NUMERIC }
 ,#{ratio,jdbcType= NUMERIC }
 ,#{colour,jdbcType=VARCHAR}
 ,#{estimateQuantity,jdbcType= NUMERIC }
@@ -81,7 +85,13 @@
 		process_date=#{processDate,jdbcType= TIMESTAMP },
 		</if>
 				<if test="processVolume!=null">
-		process_volume=#{processVolume,jdbcType=VARCHAR},
+		process_volume=#{processVolume,jdbcType= NUMERIC },
+		</if>
+				<if test="processRemark!=null">
+		process_remark=#{processRemark,jdbcType=VARCHAR},
+		</if>
+				<if test="processNumber!=null">
+		process_number=#{processNumber,jdbcType= NUMERIC },
 		</if>
 				<if test="ratio!=null">
 		ratio_=#{ratio,jdbcType= NUMERIC },
@@ -126,8 +136,8 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="WorkMap">
-		select
-id_,customer_id,name_,width_,number_,process_date,process_volume,ratio_,colour_,estimate_quantity,unit_price,reason_,cloth_price,wages_,remark_,del_flag,create_by,create_time,update_by,update_time		from base_work where id_=#{0}
+		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_,remark_,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}