生产领料单优化

src/main/java/com/jeesite/modules/erp/entity/MesMaterialOrder.java

@@ -20,6 +20,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 		@Column(name="id", attrName="id", label="id", isPK=true),
 		@Column(name="order_id", attrName="orderId", label="订单编号"),
 		@Column(name="requisition_no", attrName="requisitionNo", label="领料单号"),
+		@Column(name="line_sn", attrName="lineSn", label="产线"),
 		@Column(name="update_by", attrName="updateBy", label="更新人", isQuery=false),
 		@Column(name="update_time", attrName="updateTime", label="更新时间", isUpdateForce=true),
 		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
@@ -27,21 +28,22 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 	}, orderBy="a.id DESC"
 )
 public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String orderId;		// 订单编号
 	private String requisitionNo;		// 领料单号
+	private String lineSn;		// 产线
 	private Date updateTime;		// 更新时间
 	private Date createTime;		// 创建时间
 
 	public MesMaterialOrder() {
 		this(null);
 	}
-	
+
 	public MesMaterialOrder(String id){
 		super(id);
 	}
-	
+
 	@Size(min=0, max=64, message="订单编号长度不能超过 64 个字符")
 	public String getOrderId() {
 		return orderId;
@@ -50,7 +52,15 @@ public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
 	public void setOrderId(String orderId) {
 		this.orderId = orderId;
 	}
-	
+
+	public String getLineSn() {
+		return lineSn;
+	}
+
+	public void setLineSn(String lineSn) {
+		this.lineSn = lineSn;
+	}
+
 	@Size(min=0, max=64, message="领料单号长度不能超过 64 个字符")
 	public String getRequisitionNo() {
 		return requisitionNo;
@@ -59,7 +69,7 @@ public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
 	public void setRequisitionNo(String requisitionNo) {
 		this.requisitionNo = requisitionNo;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
@@ -68,7 +78,7 @@ public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
@@ -77,5 +87,5 @@ public class MesMaterialOrder extends DataEntity<MesMaterialOrder> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
-}
+
+}

src/main/resources/views/modules/erp/mesMaterialOrderForm.html

@@ -1,9 +1,9 @@
-<% layout('/layouts/default.html', {title: '订单领料表管理', libs: ['validate']}){ %>
+<% layout('/layouts/default.html', {title: '生产领料单管理', libs: ['validate']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa icon-note"></i> ${text(mesMaterialOrder.isNewRecord ? '新增订单领料表' : '编辑订单领料表')}
+				<i class="fa icon-note"></i> ${text(mesMaterialOrder.isNewRecord ? '新增生产领料单' : '编辑生产领料单')}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -17,7 +17,7 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-								<span class="required hide">*</span> ${text('订单编号')}：<i class="fa icon-question hide"></i></label>
+								<span class="required hide">*</span> ${text('生产订单号')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:input path="orderId" maxlength="64" class="form-control"/>
 							</div>
@@ -81,4 +81,4 @@ $("#inputForm").validate({
 		}, "json");
     }
 });
-</script>
+</script>