1

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

@@ -888,7 +888,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         sheet.setColumnWidth(16, 12 * 256 + 184);
         sheet.setColumnWidth(17, 12 * 256 + 184);
         sheet.setColumnWidth(18, 12 * 256 + 184);
-        sheet.setColumnWidth(19, 1 * 256 + 184);
+        sheet.setColumnWidth(19, 12 * 256 + 184);
+        sheet.setColumnWidth(20, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -946,6 +947,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(18);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(19);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         HSSFRow row1 = sheet.createRow((int) rownum);
@@ -984,10 +987,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         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("合计应付");
@@ -1004,13 +1007,14 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell = row1.createCell(18);
         cell.setCellValue("开户支行");
         cell.setCellStyle(styleDetail);
+        cell = row1.createCell(19);
+        cell.setCellValue("开票日期");
+        cell.setCellStyle(styleDetail);
 
         rownum++;
         DecimalFormat decimalFormat=new DecimalFormat(".00");
         String compName = commonCompanyService.selectById(AuthSecurityUtils.getCurrentUserInfo().getCompId()).getCompName();
 
-//        BigDecimal bd = new BigDecimal(value);
-//        bd = bd.setScale(2, RoundingMode.HALF_UP);
         // 详情信息
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(paymentManagement.getPaymentManagementList())) {
             for (int i = 0; i < paymentManagement.getPaymentManagementList().size(); i++) {
@@ -1045,16 +1049,23 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getCarNo()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(10);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
+                if("潮粮".equals(paymentManagement1.getType())){
+                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getTidalGrainPrice())).toString());
+
+                }
+                else{
+                    cell.setCellValue(new Formatter().format("%.3f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
+
+                }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(11);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(12);
-                cell.setCellValue(new Formatter().format("%.4f", editFloat(paymentManagement1.getSolidGrainPrice())).toString());
+                cell.setCellValue(new Formatter().format("%.4f", editFloat(paymentManagement1.getUnitDeduction())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
-                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getPureWeight())).toString());
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(paymentManagement1.getWeightDeduction())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(14);
                 cell.setCellValue(new Formatter().format("%.1f", editFloat(paymentManagement1.getAmountIngPayable())).toString());
@@ -1071,6 +1082,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell = rowx.createCell(18);
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(19);
+                cell.setCellValue(DateUtil.formatDate(paymentManagement1.getCreateDate() != null ? paymentManagement1.getCreateDate()  : addDateOneDay(new Date()), DateUtils.DATE_FMT_YYYY_MM_DD));
+                cell.setCellStyle(styleDetail);
                 rownum++;
             }