卷长虚数相关内容

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

@@ -26,6 +26,8 @@ public class Stock {
     private String stockNumber;
         @ApiModelProperty(value = "长度")
     private BigDecimal length;
+        @ApiModelProperty(value = "标签长度")
+    private BigDecimal tagLength;
         @ApiModelProperty(value = "瑕疵")
     private String flaw;
         @ApiModelProperty(value = "状态")

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

@@ -55,6 +55,10 @@ public class Work {
     private BigDecimal wages;
         @ApiModelProperty(value = "卷长（米/卷）")
     private BigDecimal rollLength;
+        @ApiModelProperty(value = "挂码运算")
+    private String tagOperator;
+        @ApiModelProperty(value = "挂码系数")
+    private BigDecimal tagFactor;
         @ApiModelProperty(value = "备注")
     private String remark;
         @ApiModelProperty(value = "状态")

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

@@ -9,6 +9,7 @@
 		<result property="machineName" column="machine_name" />
 		<result property="stockNumber" column="stock_number" />
 		<result property="length" column="length_" />
+		<result property="tagLength" column="tag_length" />
 		<result property="flaw" column="flaw_" />
 		<result property="status" column="status_" />
 		<result property="delFlag" column="del_flag" />
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_stock
-	    (id_,work_id,machine_name,stock_number,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time)
+	    (id_,work_id,machine_name,stock_number,length_,tag_length,flaw_,status_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -33,6 +34,7 @@
 ,#{machineName,jdbcType=VARCHAR}
 ,#{stockNumber,jdbcType=VARCHAR}
 ,#{length,jdbcType= NUMERIC }
+,#{tagLength,jdbcType= NUMERIC }
 ,#{flaw,jdbcType=VARCHAR}
 ,#{status,jdbcType= NUMERIC }
 ,#{delFlag,jdbcType= NUMERIC }
@@ -60,6 +62,9 @@
 		</if>
 				<if test="length!=null">
 		length_=#{length,jdbcType= NUMERIC },
+		</if>
+				<if test="tagLength!=null">
+		tag_length=#{tagLength,jdbcType= NUMERIC },
 		</if>
 				<if test="flaw!=null">
 		flaw_=#{flaw,jdbcType=VARCHAR},
@@ -87,7 +92,7 @@
 	</update>
 	<select id="get" parameterType="string" resultMap="StockMap">
 		select 
-id_,work_id,machine_name,stock_number,length_,flaw_,status_,del_flag,create_by,create_time,update_by,update_time		from base_stock where id_=#{0}
+id_,work_id,machine_name,stock_number,length_,tag_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

@@ -22,6 +22,8 @@
 		<result property="clothPrice" column="cloth_price" />
 		<result property="wages" column="wages_" />
 		<result property="rollLength" column="roll_length" />
+		<result property="tagOperator" column="tag_operator" />
+		<result property="tagFactor" column="tag_factor" />
 		<result property="remark" column="remark_" />
 		<result property="status" column="status_" />
 		<result property="delFlag" column="del_flag" />
@@ -38,7 +40,7 @@
 	-->
 	<![CDATA[
 		insert into base_work
-	    (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)
+	    (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,tag_operator,tag_factor,remark_,status_,del_flag,create_by,create_time,update_by,update_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -59,6 +61,8 @@
 ,#{clothPrice,jdbcType= NUMERIC }
 ,#{wages,jdbcType= NUMERIC }
 ,#{rollLength,jdbcType= NUMERIC }
+,#{tagOperator,jdbcType=VARCHAR}
+,#{tagFactor,jdbcType= NUMERIC }
 ,#{remark,jdbcType=VARCHAR}
 ,#{status,jdbcType= NUMERIC }
 ,#{delFlag,jdbcType= NUMERIC }
@@ -128,6 +132,12 @@
 		</if>
 				<if test="remark!=null">
 		remark_=#{remark,jdbcType=VARCHAR},
+		</if>
+				<if test="tagOperator!=null">
+		tag_operator=#{tagOperator,jdbcType=VARCHAR},
+		</if>
+				<if test="tagFactor!=null">
+		tag_factor=#{tagFactor,jdbcType=NUMERIC},
 		</if>
 				<if test="status!=null">
 		status_=#{status,jdbcType= NUMERIC },
@@ -151,8 +161,7 @@
 	where id_=#{id}
 	</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,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 * from base_work where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_work where id_=#{0}