库存表 增加卷号

加工单 增加状态

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

@@ -20,6 +20,8 @@ public class Stock {
     private String id;
         @ApiModelProperty(value = "工单编号")
     private String workId;
+        @ApiModelProperty(value = "编号")
+    private String stockNumber;
         @ApiModelProperty(value = "长度")
     private BigDecimal length;
         @ApiModelProperty(value = "瑕疵")

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

@@ -53,6 +53,8 @@ public class Work {
     private BigDecimal wages;
         @ApiModelProperty(value = "备注")
     private String remark;
+        @ApiModelProperty(value = "状态")
+    private Boolean status;
         @ApiModelProperty(value = "删除标示")
     private Boolean delFlag;
         @ApiModelProperty(value = "创建人")

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

@@ -5,16 +5,17 @@
 <mapper namespace="com.jpsoft.printing.modules.base.dao.StockDAO">
 	<resultMap id="StockMap" type="com.jpsoft.printing.modules.base.entity.Stock">
 		<id property="id" column="id_" />
-			<result property="workId" column="work_id" />
-			<result property="length" column="length_" />
-			<result property="flaw" column="flaw_" />
-			<result property="status" column="status_" />
-			<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="workId" column="work_id" />
+		<result property="stockNumber" column="stock_number" />
+		<result property="length" column="length_" />
+		<result property="flaw" column="flaw_" />
+		<result property="status" column="status_" />
+		<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.Stock">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -23,11 +24,12 @@
 	-->
 	<![CDATA[
 		insert into base_stock
-	    (id_,work_id,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,work_id,stock_number,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
 ,#{workId,jdbcType=VARCHAR}
+,#{stockNumber,jdbcType=VARCHAR}
 ,#{length,jdbcType= NUMERIC }
 ,#{flaw,jdbcType=VARCHAR}
 ,#{status,jdbcType= NUMERIC }
@@ -47,6 +49,9 @@
 		<set>
 				<if test="workId!=null">
 		work_id=#{workId,jdbcType=VARCHAR},
+		</if>
+				<if test="stockNumber!=null">
+		stock_number=#{stockNumber,jdbcType=VARCHAR},
 		</if>
 				<if test="length!=null">
 		length_=#{length,jdbcType= NUMERIC },
@@ -77,7 +82,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="StockMap">
 		select 
-id_,work_id,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time		from base_stock where id_=#{0}
+id_,work_id,stock_number,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time		from base_stock where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_stock where id_=#{0}

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

@@ -5,28 +5,29 @@
 <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="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>
+		<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="status" column="status_" />
+		<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">
@@ -35,7 +36,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_,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_,status_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -55,6 +56,7 @@
 ,#{clothPrice,jdbcType= NUMERIC }
 ,#{wages,jdbcType= NUMERIC }
 ,#{remark,jdbcType=VARCHAR}
+,#{status,jdbcType= NUMERIC }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
@@ -116,6 +118,9 @@
 		</if>
 				<if test="remark!=null">
 		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="status!=null">
+		status_=#{status,jdbcType= NUMERIC },
 		</if>
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
@@ -137,7 +142,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_,remark_,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,unit_price,reason_,cloth_price,wages_,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}

web/src/main/java/com/jpsoft/printing/modules/base/controller/WorkController.java

@@ -60,6 +60,7 @@ public class WorkController {
 
         try {
             work.setId(UUID.randomUUID().toString());
+            work.setStatus(false);
             work.setDelFlag(false);
             work.setCreateBy(subject);
             work.setCreateTime(new Date());