From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/LayoutsData.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/LayoutsData.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/LayoutsData.java
index 4c59548..f9a2d9c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/LayoutsData.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/LayoutsData.java
@@ -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;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0