Browse Source

1 销售发票结算模块添加标财发票号

11816 12 hours ago
parent
commit
cf985a4ac0

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/dto/InfXiaoshoujiesuankaipiaoExcelDTO.java View File

30
     private Double ntSoAmt;
30
     private Double ntSoAmt;
31
     @ExcelProperty(index = 9) // H列 - 销项税率
31
     @ExcelProperty(index = 9) // H列 - 销项税率
32
     private Double outTaxRate;
32
     private Double outTaxRate;
33
+    @ExcelProperty(index = 10) // I列
34
+    private String bcInvoiceNo;
33
 
35
 
34
 }
36
 }

+ 3
- 0
src/main/java/com/example/backend/pAndSExe/model/InfXiaoshoujiesuankaipiao.java View File

102
     private String createBy;
102
     private String createBy;
103
     @TableField(value ="ntSoAmt")
103
     @TableField(value ="ntSoAmt")
104
     private BigDecimal ntSoAmt;
104
     private BigDecimal ntSoAmt;
105
+
106
+    @TableField(value ="bcInvoiceNo")
107
+    private String bcInvoiceNo;
105
 }
108
 }

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/XiaoshoujiesuankaipiaoSettleServiceImpl.java View File

96
                 saleSettle.setUpdateTime(new Date());
96
                 saleSettle.setUpdateTime(new Date());
97
                 saleSettle.setPlaced("2");
97
                 saleSettle.setPlaced("2");
98
                 saleSettle.setRptg(salesOrder.getRptg());
98
                 saleSettle.setRptg(salesOrder.getRptg());
99
+                saleSettle.setBcInvoiceNo(inf.getBcInvoiceNo());
99
 
100
 
100
                 // 我方代码
101
                 // 我方代码
101
                 saleSettle.setFours(salesOrder.getFours());
102
                 saleSettle.setFours(salesOrder.getFours());
137
                 saleSettle.setIfgc(salesOrder.getIfgc());
138
                 saleSettle.setIfgc(salesOrder.getIfgc());
138
                 saleSettle.setIfWeighedSalesQty(salesOrder.getIfWeighedSalesQty());
139
                 saleSettle.setIfWeighedSalesQty(salesOrder.getIfWeighedSalesQty());
139
 
140
 
141
+
140
                 Rate rate=paymgrctrlMapper.selectRate(salesOrder.getCurcy());
142
                 Rate rate=paymgrctrlMapper.selectRate(salesOrder.getCurcy());
141
                 if (rate!=null ){
143
                 if (rate!=null ){
142
                     saleSettle.setRateUsd(rate.getRateUsd());
144
                     saleSettle.setRateUsd(rate.getRateUsd());

+ 6
- 0
src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java View File

1534
         if (createBy.isEmpty()) {
1534
         if (createBy.isEmpty()) {
1535
             errorLogList.add("制单人为空");
1535
             errorLogList.add("制单人为空");
1536
         }
1536
         }
1537
+        String bcInvoiceNo=trimField(dto.getBcInvoiceNo());
1538
+        if (bcInvoiceNo.isEmpty()) {
1539
+            errorLogList.add("发票号为空");
1540
+        }
1537
 
1541
 
1538
 
1542
 
1539
 
1543
 
1593
             entity.setCreateBy(cb);
1597
             entity.setCreateBy(cb);
1594
         }
1598
         }
1595
 
1599
 
1600
+
1596
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
1601
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
1597
         entity.setErrorLog(errorLog);
1602
         entity.setErrorLog(errorLog);
1598
         entity.setCreateTime(new Date());
1603
         entity.setCreateTime(new Date());
1613
         entity.setOutTaxRate(outTaxRate);
1618
         entity.setOutTaxRate(outTaxRate);
1614
         entity.setCreateBy(createBy);
1619
         entity.setCreateBy(createBy);
1615
         entity.setNtSoAmt(ntSoAmt);
1620
         entity.setNtSoAmt(ntSoAmt);
1621
+        entity.setBcInvoiceNo(bcInvoiceNo);
1616
 
1622
 
1617
         // 6. 生成流水号(前缀XS+年月+6位自增ID)
1623
         // 6. 生成流水号(前缀XS+年月+6位自增ID)
1618
         InfExe1Amount infExe1Amount = new InfExe1Amount();
1624
         InfExe1Amount infExe1Amount = new InfExe1Amount();

Loading…
Cancel
Save