wangxichen 1 hete
szülő
commit
ed16231815

+ 5 - 0
build.xml

@@ -21,6 +21,11 @@
 		       target="1.8"
 		       includeantruntime="false"
 		       debug="true">
+			<classpath>
+				<fileset dir="lib">
+					<include name="*.jar"/>
+				</fileset>
+			</classpath>
 		</javac>
 	</target>
 

+ 2 - 7
src/com/mes/print/TestMain.java

@@ -36,13 +36,8 @@ public class TestMain {
 
 		if ("card".equals(action)) {
 			FlowCardData d = new FlowCardData();
-			d.setProduct("+KB24");
-			d.setSn("A2026072200001");
-			d.setOpNo("OP130B");
-			d.setBatch("B2026072201");
-			d.setDate("2026-07-22");
-			d.setOperator("tester");
-			d.setRemark("测试流转卡");
+			d.setSn("+KB24IS3031T721000201");
+			d.setSteelSn("GY100000LX");
 			Printer.printFlowCard(d);
 			System.out.println("测试流转卡已发送");
 			return;

+ 3 - 26
src/com/mes/print/model/FlowCardData.java

@@ -2,39 +2,16 @@ package com.mes.print.model;
 
 /**
  * 流转卡数据(A4 打印)
+ * PDF 模板打印只使用 sn(客户码)和 steelSn(钢印码)两个字段
  */
 public class FlowCardData {
 
-	private String product;   // 产品编号
-	private String sn;        // 序列号
-	private String steelSn;   // 钢印码(用于镭雕流程)
-	private String opNo;      // 工序号
-	private String batch;     // 批次
-	private String date;      // 日期
-	private String operator;  // 操作员
-	private String remark;    // 备注
-
-	public String getProduct() { return product; }
-	public void setProduct(String product) { this.product = product; }
+	private String sn;        // 序列号(客户码,如 +KB60IS3031T611001201)
+	private String steelSn;   // 钢印码(如 GY100000LX)
 
 	public String getSn() { return sn; }
 	public void setSn(String sn) { this.sn = sn; }
 
 	public String getSteelSn() { return steelSn; }
 	public void setSteelSn(String steelSn) { this.steelSn = steelSn; }
-
-	public String getOpNo() { return opNo; }
-	public void setOpNo(String opNo) { this.opNo = opNo; }
-
-	public String getBatch() { return batch; }
-	public void setBatch(String batch) { this.batch = batch; }
-
-	public String getDate() { return date; }
-	public void setDate(String date) { this.date = date; }
-
-	public String getOperator() { return operator; }
-	public void setOperator(String operator) { this.operator = operator; }
-
-	public String getRemark() { return remark; }
-	public void setRemark(String remark) { this.remark = remark; }
 }

+ 1 - 38
src/com/mes/print/template/FlowCardRenderer.java

@@ -99,43 +99,10 @@ public class FlowCardRenderer {
 				}
 			};
 		} catch (Exception e) {
-			e.printStackTrace();
-			// 降级:如果 PDF 模板加载失败,用简单文本打印
-			return renderSimple(data);
+			throw new RuntimeException("流转卡渲染失败: " + e.getMessage(), e);
 		}
 	}
 
-	/** 降级方案:纯文本流转卡 */
-	private static Printable renderSimple(final FlowCardData data) {
-		return new Printable() {
-			@Override
-			public int print(Graphics g, PageFormat pf, int idx) {
-				if (idx > 0) return NO_SUCH_PAGE;
-				Graphics2D g2 = (Graphics2D) g;
-				g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-				g2.translate(pf.getImageableX(), pf.getImageableY());
-				drawSimple(g2, data);
-				return PAGE_EXISTS;
-			}
-		};
-	}
-
-	private static void drawSimple(Graphics2D g, FlowCardData d) {
-		g.setFont(new Font("宋体", Font.BOLD, 22));
-		g.drawString("生产流转卡", 220, 40);
-		g.drawLine(30, 60, 550, 60);
-		g.setFont(new Font("宋体", Font.PLAIN, 14));
-		int y = 100, step = 32;
-		g.drawString("产品编号: " + safe(d.getProduct()), 50, y); y += step;
-		g.drawString("序列号 : " + safe(d.getSn()), 50, y); y += step;
-		g.drawString("钢印码 : " + safe(d.getSteelSn()), 50, y); y += step;
-		g.drawString("工序号 : " + safe(d.getOpNo()), 50, y); y += step;
-		g.drawString("批次  : " + safe(d.getBatch()), 50, y); y += step;
-		g.drawString("日期  : " + safe(d.getDate()), 50, y); y += step;
-		g.drawString("操作员 : " + safe(d.getOperator()), 50, y); y += step;
-		g.drawString("备注  : " + safe(d.getRemark()), 50, y);
-	}
-
 	private static void drawDynamic(Graphics2D g2, BufferedImage qr, FlowCardData d) {
 		// 白底盖一下原模板上的二维码占位图
 		g2.setColor(Color.WHITE);
@@ -233,8 +200,4 @@ public class FlowCardRenderer {
 			return null;
 		}
 	}
-
-	private static String safe(String s) {
-		return s == null ? "" : s;
-	}
 }

+ 2 - 9
src/com/mes/print/ui/PrinterSettingDialog.java

@@ -6,8 +6,6 @@ import com.mes.print.model.LabelData;
 
 import javax.swing.*;
 import java.awt.*;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -159,13 +157,8 @@ public class PrinterSettingDialog extends JDialog {
 
 	private void sendTestFlowCard() {
 		FlowCardData d = new FlowCardData();
-		d.setSn("TEST0001");
-		d.setProduct("+TEST");
-		d.setOpNo("TEST-OP");
-		d.setBatch("TEST-BATCH");
-		d.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()));
-		d.setOperator("tester");
-		d.setRemark("这是一张测试流转卡");
+		d.setSn("+TEST0001");
+		d.setSteelSn("TEST-STEEL");
 		Printer.printFlowCard(d);
 	}