zhangyuewww 3 gadi atpakaļ
vecāks
revīzija
ad21d8de9d

+ 47 - 38
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -915,7 +915,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(22, 12 * 256 + 184);
         sheet.setColumnWidth(23, 12 * 256 + 184);
         sheet.setColumnWidth(24, 12 * 256 + 184);
-        sheet.setColumnWidth(25, 1 * 256 + 184);
+        sheet.setColumnWidth(25, 12 * 256 + 184);
+        sheet.setColumnWidth(26, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -985,6 +986,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(24);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(25);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -1002,63 +1005,66 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellValue("业务编号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(5);
-        cell.setCellValue("供应商");
+        cell.setCellValue("客户");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(6);
-        cell.setCellValue("货名");
+        cell.setCellValue("供应商");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(7);
-        cell.setCellValue("类型");
+        cell.setCellValue("货名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(8);
-        cell.setCellValue("等级");
+        cell.setCellValue("类型");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(9);
-        cell.setCellValue("水分");
+        cell.setCellValue("等级");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(10);
-        cell.setCellValue("杂质");
+        cell.setCellValue("水分");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(11);
-        cell.setCellValue("车牌号");
+        cell.setCellValue("杂质");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(12);
-        cell.setCellValue("净重单价");
+        cell.setCellValue("车牌号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(13);
-        cell.setCellValue("毛重");
+        cell.setCellValue("净重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(14);
-        cell.setCellValue("重");
+        cell.setCellValue("重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(15);
-        cell.setCellValue("重");
+        cell.setCellValue("重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(16);
-        cell.setCellValue("重");
+        cell.setCellValue("重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(17);
-        cell.setCellValue("扣单价");
+        cell.setCellValue("净重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(18);
-        cell.setCellValue("纯重单价");
+        cell.setCellValue("单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(19);
-        cell.setCellValue("纯重");
+        cell.setCellValue("纯重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(20);
-        cell.setCellValue("合计应付");
+        cell.setCellValue("纯重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("实付金额");
+        cell.setCellValue("合计应付");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("姓名");
+        cell.setCellValue("实付金额");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("卡号");
+        cell.setCellValue("姓名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
+        cell.setCellValue("卡号");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(25);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
 
@@ -1096,24 +1102,27 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(6);
-                cell.setCellValue(editString(paymentManagement1.getGoodsName()));
+                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getSupplier()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(7);
-                cell.setCellValue(editString(paymentManagement1.getType()));
+                cell.setCellValue(editString(paymentManagement1.getGoodsName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(8);
-                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getGrade()));
+                cell.setCellValue(editString(paymentManagement1.getType()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(9);
-                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getWaterContent()));
+                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getGrade()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(10);
-                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getImpurity()));
+                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getWaterContent()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(11);
-                cell.setCellValue(editString(paymentManagement1.getCarNo()));
+                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getImpurity()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
+                cell.setCellValue(editString(paymentManagement1.getCarNo()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(13);
 //                if("潮粮".equals(paymentManagement1.getType())){
 //                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
 //
@@ -1124,40 +1133,40 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
 //                }
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(13);
+                cell = rowx.createCell(14);
                 cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(14);
+                cell = rowx.createCell(15);
                 cell.setCellValue(editFloat(paymentManagement1.getTare()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(15);
+                cell = rowx.createCell(16);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(16);
+                cell = rowx.createCell(17);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 cell.setCellValue(new Formatter().format("%.4f", editFloat(paymentManagement1.getUnitDeduction())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getAmountIngPayable())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 cell.setCellValue(editFloat(paymentManagement1.getAmountEdPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankCard()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);