ERP_override.git

			@@ -29,6 +29,12 @@
			public int getWidth() {
			return width;
			}
			public int getSameCount() {
			return sameCount;
			}
			public String getWuliao() {
			return material;
			}

			public int getHeight() {
			return height;
			@@ -43,7 +49,7 @@
			@JsonProperty("isRemain")
			private boolean isRemain;
			@JsonProperty("h")
			private int height;
			private int h;
			@JsonProperty("DM2")
			private int dm2;
			@JsonProperty("xuhao")
			@@ -59,7 +65,7 @@
			@JsonProperty("LM1")
			private int lm1;
			@JsonProperty("w")
			private int width;
			private int W;
			@JsonProperty("x")
			private int x;
			@JsonProperty("y")
			@@ -68,15 +74,40 @@
			private int rowNumber;

			public int getWidth() {
			return width;
			return W;
			}

			public int getHeight() {
			return height;
			return h;
			}


			public String getProcessCard() {
			return processCard;
			}

			public int getW() {
			return W;
			}

			public int getX() {
			return x;
			}

			public int getY() {
			return y;
			}

			public String getJiaHao() {
			return jiaHao;
			}

			public int getH() {
			return h;
			}

			public boolean isRemain() {
			return isRemain;
			}
			}
			}