ERP_override.git

			@@ -3,6 +3,7 @@
			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.example.erp.entity.sd.Order;
			import com.example.erp.entity.sd.OrderDetail;
			import com.example.erp.entity.sd.OrderGlassDetail;
			@@ -11,6 +12,7 @@

			import java.time.LocalDate;
			@Data
			@TableName("pp.`flow_card`")
			public class FlowCard {
			@TableId(type = IdType.AUTO)
			//自增id
			@@ -26,7 +28,7 @@
			//序号
			private Integer orderNumber;
			//工艺确认序号
			private Integer technologyNumber;
			private String technologyNumber;
			//分架数量
			private Integer quantity;
			//已优化数量
			@@ -60,12 +62,26 @@
			private LocalDate splitFrameTime;
			//排序
			private Integer sort;
			//架号
			private String rack;
			//订单转移导入数量
			private Integer importNumber;
			//订单转移导出数量
			private Integer exportNumber;
			//连线状态(0不连线1连线，默认1，添加时间
			private Integer onlineStatus;
			//建立时间
			private LocalDate createTime;
			//修改时间
			private LocalDate updateTime;

			//查询用
			//流程卡面积
			@TableField(select = false,exist = false)
			private Double computeGrossArea;
			//标签打印数量
			@TableField(select = false,exist = false)
			private Integer printQuantity;
			//报工编号
			@TableField(select = false,exist = false)
			private String reportingWorkId;
			@@ -88,9 +104,21 @@
			//版图ID
			@TableField(select = false,exist = false)
			private String stockId;
			//小片序号
			@TableField(select = false,exist = false)
			private Integer polysId;
			//小片数量
			@TableField(select = false,exist = false)
			private String glassCount;
			//补片状态
			@TableField(select = false,exist = false)
			private Integer patchState;
			//批次
			@TableField(select = false,exist = false)
			private String batch;
			//产品名称
			@TableField(select = false,exist = false)
			private String productName;

			//外键订单表
			@TableField(select = false,exist= false)
			@@ -104,4 +132,6 @@

			@TableField(select = false,exist= false)
			private Product product;


			}