导出

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

@@ -1042,12 +1042,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(4, "开票日期".getBytes().length*2*256);
         sheet.setColumnWidth(5, "业务编号".getBytes().length*2*256);
         sheet.setColumnWidth(6, 12 * 256 + 184);
-        sheet.setColumnWidth(7, 12 * 256 + 184);
+        sheet.setColumnWidth(7, "客户身份证号".getBytes().length*2*256);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
         sheet.setColumnWidth(10, 12 * 256 + 184);
-        sheet.setColumnWidth(11, "货名".getBytes().length*3*256);
-        sheet.setColumnWidth(12, 12 * 256 + 184);
+        sheet.setColumnWidth(11, 12 * 256 + 184);
+        sheet.setColumnWidth(12, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
         sheet.setColumnWidth(15, 12 * 256 + 184);
@@ -1068,9 +1068,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(30, 12 * 256 + 184);
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
-        sheet.setColumnWidth(33, "卡号".getBytes().length*4*256);
-        sheet.setColumnWidth(34, "开户支行".getBytes().length*4*256);
-        sheet.setColumnWidth(35, 1 * 256 + 184);
+        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(34, "卡号".getBytes().length*4*256);
+        sheet.setColumnWidth(35, "开户支行".getBytes().length*4*256);
+        sheet.setColumnWidth(36, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -1160,6 +1161,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(34);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(35);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
 
@@ -1224,60 +1227,62 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(13);
         cell.setCellStyle(styleDetail);
-        //水分平均值
         cell = rowp.createCell(14);
+        cell.setCellStyle(styleDetail);
+        //水分平均值
+        cell = rowp.createCell(15);
         cell.setCellValue(waterContentTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(15);
+        cell = rowp.createCell(16);
         cell.setCellValue(impurityTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(16);
+        cell = rowp.createCell(17);
         cell.setCellValue(mildewGrainTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(17);
+        cell = rowp.createCell(18);
         cell.setCellValue(imperfectGrainTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(18);
+        cell = rowp.createCell(19);
         cell.setCellValue(bulkDensityTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(19);
+        cell = rowp.createCell(20);
         cell.setCellValue(jiaorenliTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(20);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(21);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(22);
         cell.setCellValue(paymentManagement.getPaymentManagementList().size());
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(22);
+        cell = rowp.createCell(23);
         cell.setCellValue(amountIngPayableTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(23);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(24);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(25);
         cell.setCellStyle(styleDetail);
-        //净重合计
         cell = rowp.createCell(26);
+        cell.setCellStyle(styleDetail);
+        //净重合计
+        cell = rowp.createCell(27);
         cell.setCellValue(netWeightTotal);
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(27);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(28);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(29);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(30);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(31);
         cell.setCellValue(amountIngPayableTotal);
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(31);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(32);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(33);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(34);
         cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(35);
+        cell.setCellStyle(styleDetail);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -1301,87 +1306,90 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         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.setCellValue("毛重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(25);
-        cell.setCellValue("扣重");
+        cell.setCellValue("皮重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(26);
-        cell.setCellValue("净重");
+        cell.setCellValue("扣重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(27);
-        cell.setCellValue("扣单价");
+        cell.setCellValue("净重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(28);
-        cell.setCellValue("纯重单价");
+        cell.setCellValue("扣单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(29);
-        cell.setCellValue("纯重");
+        cell.setCellValue("纯重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(30);
-        cell.setCellValue("合计应付");
+        cell.setCellValue("纯重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(31);
-        cell.setCellValue("实付金额");
+        cell.setCellValue("合计应付");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(32);
-        cell.setCellValue("姓名");
+        cell.setCellValue("实付金额");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(33);
-        cell.setCellValue("卡号");
+        cell.setCellValue("姓名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(34);
+        cell.setCellValue("卡号");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(35);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -1415,91 +1423,94 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(7);
-                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getSupplier()));
+                cell.setCellValue(editString(paymentManagement1.getCustomerNumberCard()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(8);
-                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getQualityInspector()));
+                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getSupplier()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(9);
-                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getReInspector()));
+                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getQualityInspector()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(10);
-                cell.setCellValue(editString(paymentManagement1.getWeighingManagement().getSkinInspector()));
+                cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getReInspector()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(11);
-                cell.setCellValue(editString(paymentManagement1.getGoodsName()));
+                cell.setCellValue(editString(paymentManagement1.getWeighingManagement().getSkinInspector()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
-                cell.setCellValue(editString(paymentManagement1.getType()));
+                cell.setCellValue(editString(paymentManagement1.getGoodsName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
+                cell.setCellValue(editString(paymentManagement1.getType()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(14);
                 cell.setCellValue(editString(paymentManagement1.getQualityInspectionManagement().getGrade()));
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
-                cell = rowx.createCell(14);
+                cell = rowx.createCell(15);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getWaterContent()!=null?paymentManagement1.getQualityInspectionManagement().getWaterContent():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(15);
+                cell = rowx.createCell(16);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getImpurity()!=null?paymentManagement1.getQualityInspectionManagement().getImpurity():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(16);
+                cell = rowx.createCell(17);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getMildewGrain()!=null?paymentManagement1.getQualityInspectionManagement().getMildewGrain():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getImperfectGrain()!=null?paymentManagement1.getQualityInspectionManagement().getImperfectGrain():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getBulkDensity()!=null?paymentManagement1.getQualityInspectionManagement().getBulkDensity():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getQualityInspectionManagement().getJiaorenli()!=null?paymentManagement1.getQualityInspectionManagement().getJiaorenli():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 cell.setCellValue(editString(paymentManagement1.getCarNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editFloat(paymentManagement1.getTare()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(29);
+                cell = rowx.createCell(30);
                 cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(editDouble(paymentManagement1.getAmountIngPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(editDouble(paymentManagement1.getAmountEdPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankCard()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
 
@@ -1771,12 +1782,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(4, "开票日期".getBytes().length*2*256);
         sheet.setColumnWidth(5, "业务编号".getBytes().length*2*256);
         sheet.setColumnWidth(6, 12 * 256 + 184);
-        sheet.setColumnWidth(7, 12 * 256 + 184);
+        sheet.setColumnWidth(7, "客户身份证号".getBytes().length*2*256);
         sheet.setColumnWidth(8, 12 * 256 + 184);
         sheet.setColumnWidth(9, 12 * 256 + 184);
         sheet.setColumnWidth(10, 12 * 256 + 184);
-        sheet.setColumnWidth(11, "货名".getBytes().length*3*256);
-        sheet.setColumnWidth(12, 12 * 256 + 184);
+        sheet.setColumnWidth(11, 12 * 256 + 184);
+        sheet.setColumnWidth(12, "货名".getBytes().length*3*256);
         sheet.setColumnWidth(13, 12 * 256 + 184);
         sheet.setColumnWidth(14, 12 * 256 + 184);
         sheet.setColumnWidth(15, 12 * 256 + 184);
@@ -1797,8 +1808,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(30, 12 * 256 + 184);
         sheet.setColumnWidth(31, 12 * 256 + 184);
         sheet.setColumnWidth(32, 12 * 256 + 184);
-        sheet.setColumnWidth(33, "卡号".getBytes().length*4*256);
-        sheet.setColumnWidth(34, "开户支行".getBytes().length*4*256);
+        sheet.setColumnWidth(33, 12 * 256 + 184);
+        sheet.setColumnWidth(34, "卡号".getBytes().length*4*256);
+        sheet.setColumnWidth(35, "开户支行".getBytes().length*4*256);
         sheet.setColumnWidth(35, 1 * 256 + 184);
 
         // 创建单元格对象
@@ -1889,6 +1901,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(34);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(35);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         List<String> businessKeys = null;
@@ -1988,60 +2002,62 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(13);
         cell.setCellStyle(styleDetail);
-        //水分平均值
         cell = rowp.createCell(14);
+        cell.setCellStyle(styleDetail);
+        //水分平均值
+        cell = rowp.createCell(15);
         cell.setCellValue(waterContentTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(15);
+        cell = rowp.createCell(16);
         cell.setCellValue(impurityTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(16);
+        cell = rowp.createCell(17);
         cell.setCellValue(mildewGrainTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(17);
+        cell = rowp.createCell(18);
         cell.setCellValue(imperfectGrainTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(18);
+        cell = rowp.createCell(19);
         cell.setCellValue(bulkDensityTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(19);
+        cell = rowp.createCell(20);
         cell.setCellValue(jiaorenliTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(20);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(21);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(22);
         cell.setCellValue(dataList.size());
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(22);
+        cell = rowp.createCell(23);
         cell.setCellValue(amountIngPayableTotal/netWeightTotal);
         cell.setCellStyle(contextstyle1);
-        cell = rowp.createCell(23);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(24);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(25);
         cell.setCellStyle(styleDetail);
-        //净重合计
         cell = rowp.createCell(26);
+        cell.setCellStyle(styleDetail);
+        //净重合计
+        cell = rowp.createCell(27);
         cell.setCellValue(netWeightTotal);
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(27);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(28);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(29);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(30);
+        cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(31);
         cell.setCellValue(amountIngPayableTotal);
         cell.setCellStyle(styleDetail1);
-        cell = rowp.createCell(31);
-        cell.setCellStyle(styleDetail);
         cell = rowp.createCell(32);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(33);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(34);
         cell.setCellStyle(styleDetail);
+        cell = rowp.createCell(35);
+        cell.setCellStyle(styleDetail);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -2065,87 +2081,90 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         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.setCellValue("毛重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(25);
-        cell.setCellValue("扣重");
+        cell.setCellValue("皮重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(26);
-        cell.setCellValue("净重");
+        cell.setCellValue("扣重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(27);
-        cell.setCellValue("扣单价");
+        cell.setCellValue("净重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(28);
-        cell.setCellValue("纯重单价");
+        cell.setCellValue("扣单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(29);
-        cell.setCellValue("纯重");
+        cell.setCellValue("纯重单价");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(30);
-        cell.setCellValue("合计应付");
+        cell.setCellValue("纯重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(31);
-        cell.setCellValue("实付金额");
+        cell.setCellValue("合计应付");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(32);
-        cell.setCellValue("姓名");
+        cell.setCellValue("实付金额");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(33);
-        cell.setCellValue("卡号");
+        cell.setCellValue("姓名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(34);
+        cell.setCellValue("卡号");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(35);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -2180,95 +2199,98 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(7);
+                cell.setCellValue(editString(paymentManagement1.getCustomerNumberCard()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(8);
                 if (paymentManagement1 != null){
                     cell.setCellValue(editString(paymentManagement1.getSupplier()));
                 }
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(8);
+                cell = rowx.createCell(9);
                 cell.setCellValue(editString(paymentManagement1.getQualityInspector()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(9);
+                cell = rowx.createCell(10);
                 cell.setCellValue(editString(paymentManagement1.getReInspector()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(10);
+                cell = rowx.createCell(11);
                 cell.setCellValue(editString(paymentManagement1.getSkinInspector()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(11);
+                cell = rowx.createCell(12);
                 cell.setCellValue(editString(paymentManagement1.getGoodsName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(12);
+                cell = rowx.createCell(13);
                 cell.setCellValue(editString(paymentManagement1.getType()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(13);
+                cell = rowx.createCell(14);
                 cell.setCellValue(editString(paymentManagement1.getGrade()));
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
-                cell = rowx.createCell(14);
+                cell = rowx.createCell(15);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getWaterContent()!=null?paymentManagement1.getWaterContent():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(15);
+                cell = rowx.createCell(16);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getImpurity()!=null?paymentManagement1.getImpurity():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(16);
+                cell = rowx.createCell(17);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getMildewGrain()!=null?paymentManagement1.getMildewGrain():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getImperfectGrain()!=null?paymentManagement1.getImperfectGrain():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getBulkDensity()!=null?paymentManagement1.getBulkDensity():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 cell.setCellValue(Double.parseDouble(paymentManagement1.getJiaorenli()!=null?paymentManagement1.getJiaorenli():"0"));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 cell.setCellValue(editString(paymentManagement1.getCarNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editFloat(paymentManagement1.getGrossWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editFloat(paymentManagement1.getTare()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(29);
+                cell = rowx.createCell(30);
                 cell.setCellValue(editFloat(paymentManagement1.getPureWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue(editDouble(paymentManagement1.getAmountIngPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(editDouble(paymentManagement1.getAmountEdPayable()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editString(paymentManagement1.getCustomerName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 if(paymentManagement1 != null){
                     cell.setCellValue(editString(paymentManagement1.getBankCard()));
                 }
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 if(paymentManagement1 != null){
                     cell.setCellValue(editString(paymentManagement1.getBankDeposit() + "-" +paymentManagement1.getBankDepositBranch()));
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -126,6 +126,7 @@
         a.amount_not_collectable as amountNotCollectable,
         a.management_type as managementType,
         a.customer_name as customerName,
+        a.customer_number_card as customerNumberCard,
         a.customer_phone as customerPhone,
         a.collection_date as collectionDate,
         a.status,
@@ -264,7 +265,7 @@
         </if>
     </select>
 
-    <!-- 获得付款列表 -->
+    <!-- 获得导出列表 -->
     <select id="getListByConditionOut" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement">
         SELECT
@@ -274,6 +275,7 @@
         a.create_date as createDate,
         a.payment_no as paymentNo,
         a.customer_name as customerName,
+        a.customer_number_card as customerNumberCard,
         q.bin_number as binNumber,
         i.supplier,
         q.quality_inspector as qualityInspector,