From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/JsonToOptConverter.java | 146 +++++++++++++++++++++++++++++-------------------
1 files changed, 89 insertions(+), 57 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/JsonToOptConverter.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/JsonToOptConverter.java
index a45c0ff..c600248 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/JsonToOptConverter.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/JsonToOptConverter.java
@@ -4,8 +4,13 @@
import com.example.erp.entity.pp.LayoutsData.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
+/**
+ * @author SNG-012
+ */
public class JsonToOptConverter {
public static String convertToJson(LayoutsData layoutsData) throws IOException {
@@ -18,15 +23,20 @@
addHeader(optContent);
addSignatures(optContent);
addPatterns(optContent, layoutsData);
+ addCuttings(optContent, layoutsData);
+ addShapes(optContent, layoutsData);
addInfos(optContent, layoutsData);
return optContent.toString();
}
private static void addHeader(StringBuilder optContent) {
optContent.append("[OPT_Header]\n");
- optContent.append("OPTCutVersion=4.0\n");
+ optContent.append("OPTCutVersion=5.0\n");
optContent.append("Dimension=mm\n");
- optContent.append("Date=2025/2/25\n\n");
+ Date currentDate = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
+ String formattedDate = sdf.format(currentDate);
+ optContent.append("Date=" + formattedDate + "\n\n");
}
private static void addSignatures(StringBuilder optContent) {
@@ -36,70 +46,92 @@
private static void addPatterns(StringBuilder optContent, LayoutsData layoutsData) {
optContent.append("[OPT_Pattern]\n");
+ optContent.append("GlassID=FL4\n");
+ optContent.append("GlassThickness=4.00\n");
+ optContent.append("GlassCoated=0\n");
+ optContent.append("GlassType=0\n");
+ optContent.append("Pieces=" + layoutsData.getLayouts().size() + "\n");
+ optContent.append("Width=" + layoutsData.getLayouts().get(0).getWidth() + ".0\n");
+ optContent.append("Height=" + layoutsData.getLayouts().get(0).getHeight() + ".0\n");
+ optContent.append("TrimLeft=0.0\n");
+ optContent.append("TrimBottom=0.0\n");
+ optContent.append("LoaderRack=\n\n");
+ }
+
+ private static void addCuttings(StringBuilder optContent, LayoutsData layoutsData) {
+ optContent.append("[Cuttings]\n");
for (Layout layout : layoutsData.getLayouts()) {
- optContent.append("GlassID=32\n");
- optContent.append("GlassDescription=32\n");
- optContent.append("GlassType=0\n");
- optContent.append("GlassThickness=5\n");
- optContent.append("Pieces=100\n");
- optContent.append("Width=").append(layout.getWidth()).append("\n");
- optContent.append("Height=").append(layout.getHeight()).append("\n");
- optContent.append("TrimLeft=15\n");
- optContent.append("TrimBottom=0\n");
- optContent.append("TrimRight=0\n");
- optContent.append("TrimTop=0\n");
- optContent.append("MinCutDistance=10\n");
- optContent.append("Priority=0\n");
- optContent.append("TravType=XY\n\n");
+ for (Rect rect : layout.getRects()) {
+ if (!rect.isRemain()) {
+ optContent.append("x=" + rect.getX() + ".00 y=" + rect.getY() + ".00 ");
+ optContent.append("X=" + (rect.getX() + rect.getW()) + ".00 Y=" + rect.getY() + ".00 ");
+ optContent.append("x=" + (rect.getX() + rect.getW()) + ".00 y=" + (rect.getY() + rect.getH()) + ".00 ");
+ optContent.append("X=" + rect.getX() + ".00 Y=" + (rect.getY() + rect.getH()) + ".00 ");
+ optContent.append("x=" + rect.getX() + ".00 y=" + rect.getY() + ".00\n");
+ }
+ }
}
+ optContent.append("\n");
+ }
+
+ private static void addShapes(StringBuilder optContent, LayoutsData layoutsData) {
+ int shapeId = 1;
+ for (Layout layout : layoutsData.getLayouts()) {
+ for (Rect rect : layout.getRects()) {
+ if (!rect.isRemain()) {
+ optContent.append("[Shape]\n");
+ optContent.append("Id=" + shapeId + "\n");
+ optContent.append("Description=" + rect.getJiaHao() + " ShapeName=" + rect.getJiaHao() + "\n");
+ optContent.append("x=" + rect.getW() + ".0 y=" + rect.getH() + ".0\n");
+ optContent.append("X=0.0 Y=0.0 C=1\n");
+ shapeId++;
+ }
+ }
+ }
+ optContent.append("\n");
}
private static void addInfos(StringBuilder optContent, LayoutsData layoutsData) {
- int id = 1;
+ int infoId = 1;
for (Layout layout : layoutsData.getLayouts()) {
for (Rect rect : layout.getRects()) {
- optContent.append("[Info]\n");
- optContent.append("Id=").append(id++).append("\n");
- optContent.append("SecondGlassReference=\n");
- optContent.append("RackNo=0\n");
- optContent.append("SheetWidth=").append(rect.getWidth()).append("\n");
- optContent.append("SheetHeight=").append(rect.getHeight()).append("\n");
- optContent.append("Customer=\n");
- optContent.append("PosNo=\n");
- optContent.append("OrderNo=").append(rect.getProcessCard()).append("-1-").append(id - 1).append("\n");
- optContent.append("RackCode=0\n");
- optContent.append("PieceStandardPz=\n");
- optContent.append("UMPz=\n");
- optContent.append("IDPz=\n");
- optContent.append("RealDimXPz=").append(rect.getWidth()).append(".00\n");
- optContent.append("RealDimYPz=").append(rect.getHeight()).append(".00\n");
- optContent.append("GrindingPz=\n");
- optContent.append("GrindingPzX1=0\n");
- optContent.append("GrindingPzY1=0\n");
- optContent.append("GrindingPzX2=0\n");
- optContent.append("GrindingPzY2=0\n");
- optContent.append("BendingPz=\n");
- optContent.append("QuantityPz=77\n");
- optContent.append("LabelsPz=\n");
- optContent.append("LabelsPzCounter=\n");
- optContent.append("RotationAllowed=1\n");
- optContent.append("PreferencePz=\n");
- optContent.append("DescMatCompPz=\n");
- optContent.append("DeliveryDatePz=\n");
- optContent.append("PzNOTE=3C.orzx\n");
- optContent.append("PzNOTE1=\n");
- optContent.append("PzNOTE2=").append(rect.getWidth()).append("\n");
- optContent.append("PzNOTE3=").append(rect.getHeight()).append("\n");
- optContent.append("PzNOTE4=鍙充笅-30-30\n");
- optContent.append("PzNOTE5=false-true-false\n");
- optContent.append("PzNOTE6=true-true\n");
- optContent.append("PzNOTE7=").append(rect.getProcessCard()).append("-1-").append(id - 1).append("\n");
- for (int i = 8; i <= 20; i++) {
- optContent.append("PzNOTE").append(i).append("=\n");
+ if (!rect.isRemain()) {
+ optContent.append("[Info]\n");
+ optContent.append("Id=" + infoId + "\n");
+ optContent.append("SecondGlassReference=FL4\n");
+ optContent.append("RackNo=0\n");
+ optContent.append("SheetWidth=" + rect.getW() + ".0\n");
+ optContent.append("SheetHeight=" + rect.getH() + ".0\n");
+ optContent.append("Customer=\n");
+ optContent.append("PosNo=" + infoId + "\n");
+ optContent.append("OrderNo=\n");
+ optContent.append("RackCode=\n");
+ optContent.append("PieceStandardPz=0\n");
+ optContent.append("UMPz=mm\n");
+ optContent.append("IDPz=\n");
+ optContent.append("RealDimXPz=" + rect.getW() + ".0\n");
+ optContent.append("RealDimYPz=" + rect.getH() + ".0\n");
+ optContent.append("GrindingPz=0.0\n");
+ optContent.append("GrindingPzX1=0.0\n");
+ optContent.append("GrindingPzY1=0.0\n");
+ optContent.append("GrindingPzX2=0.0\n");
+ optContent.append("GrindingPzY2=0.0\n");
+ optContent.append("BendingPz=0.0\n");
+ optContent.append("QuantityPz=1\n");
+ optContent.append("PriorityPz=0\n");
+ optContent.append("LabelsPz=0\n");
+ optContent.append("LabelsPzCounter=0\n");
+ optContent.append("RotationAllowed=1\n");
+ optContent.append("PreferencePz=0\n");
+ optContent.append("DescMatCompPz=\n");
+ optContent.append("DeliveryDatePz=" + new SimpleDateFormat("dd-MM-yyyy").format(new Date()) + "\n");
+ optContent.append("PzNOTE=\n");
+ for (int i = 1; i <= 20; i++) {
+ optContent.append("PzNOTE" + i + "=\n");
+ }
+ infoId++;
}
- optContent.append("\n");
}
}
}
}
-
--
Gitblit v1.8.0