包装出库新版

src/main/java/com/jeesite/modules/mes/entity/MesBatchSn.java

@@ -22,6 +22,9 @@ import java.util.Date;
 		@Column(name="is_js", attrName="isJs", label="是否用完"),
 		@Column(name="line_sn", attrName="lineSn"),
 		@Column(name="type", attrName="type", label="类型"),
+		@Column(name="state", attrName="state", label="包装状态", comment="0=已包装 1=已出库"),
+		@Column(name="remark", attrName="remark", label="包装备注"),
+		@Column(name="remark2", attrName="remark2", label="出库备注"),
 		@Column(name="create_by", attrName="createBy", label="创建人", isUpdate=false, isQuery=false),
 		@Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isUpdateForce=true),
 		@Column(name="update_by", attrName="updateBy", label="update_by", isQuery=false),
@@ -36,6 +39,9 @@ public class MesBatchSn extends DataEntity<MesBatchSn> {
 	private String isJs;		// 是否用完
 	private String lineSn;
 	private String type;
+	private String state;		// 包装状态 0=已包装 1=已出库
+	private String remark;		// 包装备注
+	private String remark2;		// 出库备注
 
 	private Date createDate;
 	private Date updateDate;
@@ -128,4 +134,28 @@ public class MesBatchSn extends DataEntity<MesBatchSn> {
 	public void setType(String type) {
 		this.type = type;
 	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getRemark2() {
+		return remark2;
+	}
+
+	public void setRemark2(String remark2) {
+		this.remark2 = remark2;
+	}
 }

src/main/java/com/jeesite/modules/mes/entity/MesProductBatch.java

@@ -18,6 +18,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 		@Column(name="batch_sn", attrName="batchSn", label="包装码"),
 		@Column(name="cate", attrName="cate", label="产品类型 1=半成品 2=成品"),
 		@Column(name="remark", attrName="remark", label="备注"),
+		@Column(name="state", attrName="state", label="状态", comment="0=已包装 1=已出库"),
 		@Column(name="create_by", attrName="createBy", label="create_by", isUpdate=false, isQuery=false),
 		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isQuery=false, isUpdateForce=true),
 		@Column(name="update_by", attrName="updateBy", label="update_by", isQuery=false),
@@ -31,6 +32,7 @@ public class MesProductBatch extends DataEntity<MesProductBatch> {
 	private String batchSn;		// 包装码
 	private String cate;		// 产品类型 1=半成品 2=成品
 	private String remark;		// 备注
+	private String state;		// 状态 0=已包装 1=已出库
 
 	public MesProductBatch() {
 		this(null);
@@ -75,5 +77,13 @@ public class MesProductBatch extends DataEntity<MesProductBatch> {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
 	
 }

src/main/java/com/jeesite/modules/mes/web/MesBatchSnController.java

@@ -162,9 +162,9 @@ public class MesBatchSnController extends BaseController {
 			return resp;
 		}
 		while (true){
+			// 批次码全局唯一，不按产线去重，避免 CZ060/CZ061 同一秒生成相同批次码
 			MesBatchSn mesBatchSn1 = new MesBatchSn();
 			mesBatchSn1.setBatchSn(orderNumber);
-			mesBatchSn1.setLineSn(lineSn);
 			MesBatchSn check = mesBatchSnService.findInfo(mesBatchSn1);
 			if(ObjectUtils.isEmpty(check)){
 				break;