From ca69b8f9af7b06b375e9d07937c680db82b85a64 Mon Sep 17 00:00:00 2001 From: "lidy@connor.net.cn" Date: Fri, 19 Apr 2024 11:15:29 +0800 Subject: [PATCH] =?UTF-8?q?20240419lidy=E4=BB=A3=E7=A0=81=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cust/box/BoxReportOperation$1.class | Bin 8866 -> 8792 bytes .../connor/cust/box/BoxReportOperation.class | Bin 6006 -> 6006 bytes bin/com/connor/cust/util/POIUtil.class | Bin 33983 -> 33989 bytes .../connor/cust/box/BoxReportOperation.java | 19 +++++++++--------- src/com/connor/cust/util/POIUtil.java | 12 ++++++----- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/bin/com/connor/cust/box/BoxReportOperation$1.class b/bin/com/connor/cust/box/BoxReportOperation$1.class index 0742cbbecb058d9d2284d148e98d23068031c417..909c9b30a2fb085170486db0d158908039a14240 100644 GIT binary patch delta 1170 zcmXw&eN2^Q7{;&bdG14S;NStIKqP7C6b&qDxG0N42rKfVGW|Q}rpu@$ZANy|GOaAD zS5yo#BSB4rgb<7p!kG;U1^mF^@HHjZY_&;~>8P7?#$V6%KKF0WuJ?I=@0U3j7gXPj zcK(Z=<>qR_y!13@F6(8rUx+5nyH9o|8r+5>* zVXk|vh(WxIA!j%tS&8dP+)&~c`Uvz> zFu+g@(xb%8srUKT)4}U3MG=qT4K`x~Ps7Jnyu}V|Z5k?V z7QV3yQDs-6+P;KuZ6RvxCe+%^_|9%co!y3dy8{ij6vyoWd~aLugKfi)whJe051Q;C znyv2-{AB+`i@lDMb_`7tic=DfpCuAi5{Fiqfi{_qUnLE{Njlmk17{=)XC)6EvJ_pi z0_S86&PxF<$U0nUSQA69|xkxV|qEQsDz9et1LPvAm_-Ob0CjSwc-MO?rf+{RQ^Fqe-b zlo>2z9v32vS#PThO~v3ycfICtv7PX$s5Gnua`f~B0tr!{$ajL}?#PDHYqpb7_CpD0wRGzTFINIz%3YP{zzaAYZV}^Neu#6dDGN0kIaGM** z3vl7;$s9hXFA|}qOy)A3dTch%1q<3-bOZ~kH|>Ffb3Cfgp9q`-%=};jiFH~`vJcV>n=lA$4MLZXNychwaC9m{hYq{;*Lm(azj@#1-t*kP zqCLe2C!C5Z%yFmBqMlt#xY2C4dc#Xnx|P+Q0V`a9F*7`8=Cwo}=45)h`E*)w9{X)U zq~&H~T$=3=;E4-heCx1qeyk>PqCap9t zq|H_Qq`6#VGI<*Y1s}*=dTy9mh*rwjZc2$qJ)CYK5HDZSf z;T?4d^{Nd!)zJXnRh`m|;62rcU1|X9)j8}|=dnkPVXqp;J`L>G324ws2x=ET)U(m3 z=b}mbaX=SJzYHJgC(xpwLr8DLL0yZF^>&2y4z%i>IHY&sux>z`Zo#Me2#)9oKG#uv zp-1th4*ZFBeFV0*&Dpz9`J!!b}J=iKwA5Xe40BuwmG6V8n3Y95N*~4e(9n z8Cl4dFexLI@+cn!Hk@=j6+ppaIA{UgAwjyC7tx&*C6LL@K2HbiYikv;r=AK$MMMK{hRlsRlWCaZEK*0X-aHYS5iCWBHufD8<5X4%f>0nExncmlJLEbhns z@_nA;IrF}0Z0NCF49&5cdrS_bIg;gs!8(o~9pY}ZSS{y(}a A5C8xG delta 163 zcmV~$y9z-80LS6qKbMqpI}U|S2BkCFm<%$R3`+3;GBB{2WjmV(Fst(rp1^FQ4DOD* ze4lH%)?#4zHuTv#BV(f09)klJj^sFDai++H5?3nRsNquQPJ;&>p7eMz;LVs1Q@+^z zmi_@% diff --git a/bin/com/connor/cust/util/POIUtil.class b/bin/com/connor/cust/util/POIUtil.class index c0325a009862d35629a46bea9d2a4442dcfa7a43..ecbcc678f840438e26555041efc3ee733bee4e1f 100644 GIT binary patch delta 1873 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 diff --git a/src/com/connor/cust/box/BoxReportOperation.java b/src/com/connor/cust/box/BoxReportOperation.java index 1b9f2f3..6dc4ea4 100644 --- a/src/com/connor/cust/box/BoxReportOperation.java +++ b/src/com/connor/cust/box/BoxReportOperation.java @@ -42,10 +42,10 @@ public class BoxReportOperation extends AbstractAIFOperation { private LinkedList datas; private HashMap boxMap; - private final int PAGE_CNT = 23;// - private final int TITLE_CNT = 4; - private final int PAGE = PAGE_CNT + TITLE_CNT; - private final int COL_CNT = 9; + private final int PAGE_CNT = 23;//每页内容行数 + private final int TITLE_CNT = 4;//每页表头行数 + private final int PAGE = PAGE_CNT + TITLE_CNT;//每页总行数 + private final int COL_CNT = 9;//每页最大列号 /** * 装箱单报表 * @param session TCSession @@ -114,10 +114,11 @@ public class BoxReportOperation extends AbstractAIFOperation { if(b % PAGE_CNT > 0) pageCnt ++; } - for(int i=1; i<=pageCnt; i++) { -// sheet.copyRows(0, PAGE, i*PAGE, null); - POIUtil.copyRows(workbook, sheet, 0, PAGE-1, i*PAGE, COL_CNT, 1); - } +// for(int i=1; i<=pageCnt; i++) { +//// sheet.copyRows(0, PAGE, i*PAGE, null); +// POIUtil.copyRows(workbook, sheet, 0, PAGE-1, i*PAGE, COL_CNT, 1); +// } + POIUtil.copyRows(workbook, sheet, 0, PAGE-1, PAGE, COL_CNT, pageCnt - 1); int row = 0, rbox = 0, pbox = 0; for(String[] data : datas) { int box = Integer.parseInt(data[COL_CNT]); @@ -131,7 +132,7 @@ public class BoxReportOperation extends AbstractAIFOperation { rbox = 1; pbox = box; - xssfrow = TCUtil.getRow(sheet, page * PAGE + 1); + xssfrow = TCUtil.getRow(sheet, page * PAGE); cell = TCUtil.getCell(xssfrow, 5); String[] boxno = PlmLocale.getString("boxno").split(";"); cell.setCellValue(boxno[0] + getNumStr(box) + boxno[1]); diff --git a/src/com/connor/cust/util/POIUtil.java b/src/com/connor/cust/util/POIUtil.java index 8518e61..7e08890 100644 --- a/src/com/connor/cust/util/POIUtil.java +++ b/src/com/connor/cust/util/POIUtil.java @@ -506,9 +506,11 @@ public class POIUtil { XSSFCell targetCell = null; short m; sourceRow = getRow(sheet, i); - for (int j = 1; j <= copyCount; j++) { - int space = (endRow - startRow + 1 + margin) * j; - targetRow = sheet.createRow(i + space); + for (int j = 0; j < copyCount; j++) { +// int space = (endRow - startRow + 1 + margin) * j; +// targetRow = sheet.createRow(i + space); + int space = (endRow - startRow + 1) * j + margin; + targetRow = getRow(sheet, i - startRow + space); targetRow.setHeight(sourceRow.getHeight()); for (m = sourceRow.getFirstCellNum(); m <= endCol; m++) { if(m < 0) @@ -548,8 +550,8 @@ public class POIUtil { } } - for (int j = 1; j <= copyCount; j++) { - int space = (endRow - startRow + 1 + margin) * j; + for (int j = 0; j < copyCount; j++) { + int space = margin + (endRow - startRow + 1) * j - startRow; for (int n = 0; n < regionCnt; n++) { region = sheet.getMergedRegion(n); if ((region.getFirstColumn() >= startRow) && (region.getLastRow() <= endRow) && (region.getLastColumn() <= endCol)) {