From 54d01935f2ecbf277d194e6d16fff21bbc5a400c Mon Sep 17 00:00:00 2001
From: zhanghai <120228220@qq.com>
Date: Mon, 13 Nov 2023 09:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=A0=E4=B8=BA=E6=8D=A2?=
 =?UTF-8?q?=E7=9B=98=E5=AF=BC=E8=87=B4=E7=9A=84=E6=9C=89=E5=8D=B7=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.ini                                     |  4 ++--
 .../com/docus/sw/fenpan/FenpanService.java     |  1 +
 .../com/docus/sw/fenpan/MyApplication.java     | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/config.ini b/config.ini
index 4c6f77a..76def4d 100644
--- a/config.ini
+++ b/config.ini
@@ -1,8 +1,8 @@
 file.mode=图片
 file.read.url=C:\jiahsi-saomiao\缩微\ddd_0001\
-a3.length=3000
+a3.length=30
 plate.size=2800
-a3.width=3000
+a3.width=30
 file.save.url=C:\jiahsi-saomiao\缩微\分盘结果\档案图\
 zong.name.prefix=南方医院
 Split.mode=copy/cut
diff --git a/src/main/java/com/docus/sw/fenpan/FenpanService.java b/src/main/java/com/docus/sw/fenpan/FenpanService.java
index aa6d6fe..436b6ea 100644
--- a/src/main/java/com/docus/sw/fenpan/FenpanService.java
+++ b/src/main/java/com/docus/sw/fenpan/FenpanService.java
@@ -38,6 +38,7 @@ public class FenpanService {
                         //磁盘放不进去了
                         plateList.add(plate);
                         plate = new Plate(Integer.parseInt(Config.getParam("plate.size")), "盘" + i++);
+                        plate.put(roll);
                     }
                 }
                 plateList.add(plate);
diff --git a/src/main/java/com/docus/sw/fenpan/MyApplication.java b/src/main/java/com/docus/sw/fenpan/MyApplication.java
index d6124d3..6d56e39 100644
--- a/src/main/java/com/docus/sw/fenpan/MyApplication.java
+++ b/src/main/java/com/docus/sw/fenpan/MyApplication.java
@@ -58,7 +58,7 @@ public class MyApplication {
         paramPanel.add(zongPreJtf, gbc);
 
         JPanel sizePanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        sizePanel.add(new JLabel("A3大小尺寸 长:"));
+        sizePanel.add(new JLabel("A3大小尺寸(厘米) 长:"));
         JTextField a3LongJtf = new JTextField(5);
         sizePanel.add(a3LongJtf);
         sizePanel.add(new JLabel("宽:"));
@@ -225,7 +225,7 @@ public class MyApplication {
                     // 执行长时间运行的业务操作
 
                     // 模拟耗时操作
-                    String saveUrl = savePathField.getText();
+                    String saveUrl = savePathField.getText()+"/";
                     String readUrl = folderField.getText();
                     new FenpanService().fenpan(saveUrl,readUrl);
 
@@ -295,13 +295,13 @@ public class MyApplication {
             }
         });
 
-        leftIndexGbc.gridx = 0;
-        leftIndexGbc.gridy = 1;
-        leftIndexGbc.anchor = GridBagConstraints.WEST;
-        leftIndexPanel.add(new JLabel("图片dpi:"), leftIndexGbc);
-        leftIndexGbc.gridx = 1;
-        JTextField dpiField = new JTextField(5);
-        leftIndexPanel.add(dpiField, leftIndexGbc);
+//        leftIndexGbc.gridx = 0;
+//        leftIndexGbc.gridy = 1;
+//        leftIndexGbc.anchor = GridBagConstraints.WEST;
+//        leftIndexPanel.add(new JLabel("图片dpi:"), leftIndexGbc);
+//        leftIndexGbc.gridx = 1;
+//        JTextField dpiField = new JTextField(5);
+//        leftIndexPanel.add(dpiField, leftIndexGbc);
 
         // ... 其他标签左对齐，与前面的代码相同 ...