diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index cb0d917c..65413185 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -130,8 +130,11 @@ public class BaseInvoiceController extends AbstractController { String inAccountStatus = (String)map.get("inAccountStatus"); int curr = (int)map.get("curr"); int size = (int)map.get("size"); + String bzdh = (String) map.get("bzdh"); Map pramsMap = new HashMap<>(25); + pramsMap.put("bzdh", bzdh); + pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("qszt", map.get("qszt")); pramsMap.put("wrzfpStart", map.get("wrzfpStart")); pramsMap.put("wrzfpEnd", map.get("wrzfpEnd")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index f3b2f9b6..580ed7c0 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -203,6 +203,8 @@ public class BaseFpRzRespVO implements Serializable { //影像号 SN private String imageNumber; private String imageId; + //报账单号 + private String bzdh; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index 833d2cfd..74333893 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -137,6 +137,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl - + + @@ -84,6 +85,12 @@ and t.voucher_number like concat('%',concat(#{voucherNumber},'%')) + + and t.bzdh = #{bzdh} + + + and t.inaccount_status = #{inAccountStatus} + and t.qs_status = #{qszt} @@ -182,9 +189,9 @@ ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99')) - - and t.in_account_status = #{inAccountStatus} - + + + and t.sn_voucher_number = #{snVoucherNumber} @@ -332,6 +339,12 @@ and t.voucher_number like concat('%',concat(#{voucherNumber},'%')) + + and t.bzdh = #{bzdh} + + + and t.inaccount_status = #{inAccountStatus} + and t.qs_status = #{qszt} @@ -408,9 +421,9 @@ ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99')) - - and t.in_account_status = #{inAccountStatus} - + + + and t.ele_invoice_no = #{eleInvoiceNo} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index cadc6110..e106a7a5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -469,17 +469,17 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { snDetailMap.put("specificationModel", detail.getString("ggxh")); snDetailMap.put("unit", detail.getString("jldw")); String quantity = detail.getString("spsl"); - if (quantity.length() > 3) { - int index = quantity.indexOf("."); - quantity = quantity.substring(0, index + 2); - } +// if (quantity.length() > 3) { +// int index = quantity.indexOf("."); +// quantity = quantity.substring(0, index + 2); +// } snDetailMap.put("quantity", quantity); String unitPrice = detail.getString("bhsdj"); - if (unitPrice.length() > 3) { - int index = unitPrice.indexOf("."); - unitPrice = unitPrice.substring(0, index + 3); - } +// if (unitPrice.length() > 3) { +// int index = unitPrice.indexOf("."); +// unitPrice = unitPrice.substring(0, index + 3); +// } snDetailMap.put("unitPrice", unitPrice); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java index 4073adf6..5afa2ef8 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java @@ -19,7 +19,7 @@ import java.util.List; @Data -@ColumnWidth(11) +@ColumnWidth(30) @ContentFontStyle(fontHeightInPoints = 10) @HeadFontStyle(fontHeightInPoints = 12,fontName = "等线") @HeadStyle(borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderLeft = BorderStyleEnum.THIN, @@ -32,6 +32,7 @@ public class QsExcelEntity { /** * 开票日期 */ + @ExcelProperty("开票日期") private Date invoiceDate; /** diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml index f9a1fe9c..e4fbafb8 100644 --- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml @@ -91,11 +91,11 @@ #{item} - - and t.company = #{company} - - and t.qs_status = '0' - and t.source_system='0' + + + + +