From 63211c7592b9c7b814de2756d338ffd33ac0c58f Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期一, 19 一月 2026 16:37:38 +0800
Subject: [PATCH] 1、提交验收按钮新增判断是否关联附件 2、借阅暂存添加不可外借新增提醒 3、成果表单借阅管理修改为借阅记录 4、合格资料模块,导出文件按钮需要添加日志 5、装盒按钮调整:需要一个确认按钮并且可以更改盒号,调整盒号时能同步展示盒号容量 6、对接斑马打印机 7、利用用户修改

---
 src/main/java/com/zbooksoft/gdmis/common/UsbSyncExampleWindowsItem.java |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zbooksoft/gdmis/common/UsbSyncExampleWindowsItem.java b/src/main/java/com/zbooksoft/gdmis/common/UsbSyncExampleWindowsItem.java
index ac274c3..faadbb1 100644
--- a/src/main/java/com/zbooksoft/gdmis/common/UsbSyncExampleWindowsItem.java
+++ b/src/main/java/com/zbooksoft/gdmis/common/UsbSyncExampleWindowsItem.java
@@ -1,6 +1,10 @@
 package com.zbooksoft.gdmis.common;
 
+import com.ruili.wcp.common.CustomConfigUtil;
+import com.ruili.wcp.common.SpringContextUtil;
+import com.zbooksoft.gdmis.config.ArchivesCustomConfig;
 import com.zbooksoft.gdmis.data.entity.CatYswjxx;
+import com.zbooksoft.gdmis.service.CatYswjxxService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tsc_sdk.TcpComm;
@@ -12,13 +16,21 @@
 
 
 public class UsbSyncExampleWindowsItem {
+    CatYswjxxService catYswjxxService = (CatYswjxxService) SpringContextUtil.getBean("catYswjxxServiceImpl");
+    CustomConfigUtil customConfigUtil = (CustomConfigUtil) SpringContextUtil.getBean("customConfigUtil");
+
+
     private static final Logger logger = LoggerFactory.getLogger(UsbSyncExampleWindowsItem.class);
 
-    public static void printItemLabel(List<CatYswjxx> itemDataList) {
-        TcpComm asyncComm = new TcpComm("172.0.0.1", 8080);
+    public void printItemLabel(List<Long> idList) {
+        ArchivesCustomConfig archivesCustomConfig = customConfigUtil.getConfigObj(ArchivesCustomConfig.class);
+        String fileIp = archivesCustomConfig.getFileIp();
+
+        TcpComm asyncComm = new TcpComm(fileIp, 9100);
         try {
             asyncComm.open();
-            for (CatYswjxx catYswjxx : itemDataList) {
+            for (Long id : idList) {
+                CatYswjxx catYswjxx = catYswjxxService.getById(id);
                 String all = catYswjxx.getWjtm();
                 String itemCode = catYswjxx.getDh();
                 String isSecurity = catYswjxx.getSfsm();
@@ -26,12 +38,7 @@
                 String newBarCode = itemCode.replace("搴�", "D").replace("娴�", "C").replace("瑙�", "G").replace("鎺�", "T").replace("鏍�", "Y").replace("璇�", "S").replace("褰�", "L").replace("鍍�", "X").replace("缁�", "Z").replace("鏂�", "W").replace("瀹�", "S").replace("鐗�", "W").replace("閽�", "Z").replace("璁�", "S").replace("鐩�", "X").replace("娌�", "Y").replace("鐢�", "D").replace("鍦�", "D");
                 String boxMum = catYswjxx.getHh();
                 String newBoxMum = "";
-                if (boxMum.contains("鐩�")) {
-                    //鑾峰彇鐩掑瓧鍚庨潰鐨勫唴瀹�
-                    newBoxMum = boxMum.substring(1);
-                } else {
-                    newBoxMum = formatConverter(boxMum);
-                }
+                newBoxMum = boxMum;
                 newBarCode = newBarCode + "-" + newBoxMum;
                 // 浣跨敤绀轰緥
                 List<String> wrappedLines = wrapText(all, 28, 3); // 姣忚鏈�澶у搴�20
@@ -53,19 +60,27 @@
                     yPosition += 35;
                 }
 
-                commandBuilder.append("BARCODE 5,150,\"128\",140,0,0,2,2,\"").append(newBarCode).append("\"\r\n");
-                commandBuilder.append("TEXT 20,320,\"A123.TTF\",0,16,16,\"").append(itemCode).append("\"\r\n");
-                int wordWidth = getTextLong(boxMum);
+                int barcodeTextLength = newBarCode.length();
+                long barcodeWidth = barcodeTextLength * 20L;
+                long barcodeX = (400 - barcodeWidth) / 2;
+                commandBuilder.append("BARCODE ").append(barcodeX).append(",145,\"128\",140,0,0,2,2,\"").append(newBarCode).append("\"\r\n");
+                int textLong = getTextLong(itemCode);
+                long itemCodeWidth = textLong * 30L;
+                long itemCodeX = (400 - itemCodeWidth) / 2;
+                commandBuilder.append("TEXT ").append(itemCodeX).append(",315,\"A123.TTF\",0,16,16,\"").append(itemCode).append("\"\r\n");
+                int wordWidth = getTextLong("鐩�" + boxMum);
                 long boxMumWidth = wordWidth * 30L;
                 long boxMumX = (400 - boxMumWidth) / 2;
                 if ("鏄�".equals(isSecurity)) {
-                    commandBuilder.append("TEXT ").append(boxMumX).append(",395,\"A123.TTF\",0,16,16,\"").append(boxMum).append("鈽匼"\r\n");
+                    commandBuilder.append("TEXT ").append(boxMumX).append(",390,\"A123.TTF\",0,16,16,\"").append("鐩�").append(boxMum).append("鈽匼"\r\n");
                 } else {
                     boxMumX = boxMumX + 10;
-                    commandBuilder.append("TEXT ").append(boxMumX).append(",395,\"A123.TTF\",0,16,16,\"").append(boxMum).append("\"\r\n");
+                    commandBuilder.append("TEXT ").append(boxMumX).append(",390,\"A123.TTF\",0,16,16,\"").append("鐩�").append(boxMum).append("\"\r\n");
                 }
                 commandBuilder.append("PRINT 1\r\n");
-                byte[] dataToSend = commandBuilder.toString().getBytes();
+                System.out.println(commandBuilder.toString());
+                byte[] dataToSend = commandBuilder.toString().getBytes("UTF-8");
+
                 asyncComm.writeSync(dataToSend);
             }
             Thread.sleep(25000);

--
Gitblit v1.9.1