Browse Source

1 收款认领模块添加确认金额,实际到账金额,销售订单号

11816 3 months ago
parent
commit
b961b59c9f

+ 7
- 7
src/main/java/com/example/backend/pAndSExe/dto/InfShoukuanrenlingExcelDTO.java View File

10
 @Data
10
 @Data
11
 public class InfShoukuanrenlingExcelDTO {
11
 public class InfShoukuanrenlingExcelDTO {
12
 
12
 
13
-    @ExcelProperty(index = 0) // G列 - 制单人
13
+    @ExcelProperty(index = 0) // A列 - 制单人
14
     private String createBy;
14
     private String createBy;
15
-    @ExcelProperty(index = 1) // A列 - 销售合同号
15
+    @ExcelProperty(index = 1) // B列 - 销售合同号
16
     private String sono;
16
     private String sono;
17
-    @ExcelProperty(index = 2) // B列 - 发票号 --新增
17
+    @ExcelProperty(index = 2) // C列 - 发票号 --新增
18
     private String invNo;
18
     private String invNo;
19
-    @ExcelProperty(index = 3) // C列 - 水单编码
19
+    @ExcelProperty(index = 3) // D列 - 水单编码
20
     private String stmtNo;
20
     private String stmtNo;
21
-    @ExcelProperty(index = 4) // D列 - 客户编号+客户名称(合并列)
21
+    @ExcelProperty(index = 4) // E列 - 客户编号+客户名称(合并列)
22
     private String ctNoCtName;
22
     private String ctNoCtName;
23
-    @ExcelProperty(index = 5) // E列 - 认领金额
23
+    @ExcelProperty(index = 5) // F列 - 认领金额
24
     private Double claimedAmt;
24
     private Double claimedAmt;
25
-    @ExcelProperty(index = 6) // F列 - 币别
25
+    @ExcelProperty(index = 6) // G列 - 币别
26
     private String curcy;
26
     private String curcy;
27
 }
27
 }

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

468
     /** 数据库原始QICHU字段(无备注) */
468
     /** 数据库原始QICHU字段(无备注) */
469
     @TableField("QICHU")
469
     @TableField("QICHU")
470
     private String qichu2;
470
     private String qichu2;
471
+
472
+    @TableField("confirmAmt")
473
+    private BigDecimal confirmAmt;
471
 }
474
 }

+ 3
- 1
src/main/java/com/example/backend/pAndSExe/service/impl/ShoukuanrenlingSettleServiceImpl.java View File

115
                     breceiptctrl.setRateUs(rate.getRateUs());
115
                     breceiptctrl.setRateUs(rate.getRateUs());
116
                     breceiptctrl.setRate(rate.getRate());
116
                     breceiptctrl.setRate(rate.getRate());
117
                 }
117
                 }
118
-
118
+                breceiptctrl.setConfirmAmt(inf.getClaimedAmt());
119
+                breceiptctrl.setBankRcptAmt(inf.getClaimedAmt());
120
+                breceiptctrl.setSoordAdd(inf.getSono());
119
                 // 插入主表
121
                 // 插入主表
120
                 //breceiptctrlMapper.insertBreceiptctrl(breceiptctrl);
122
                 //breceiptctrlMapper.insertBreceiptctrl(breceiptctrl);
121
                 breceiptctrlMapper.insert(breceiptctrl);
123
                 breceiptctrlMapper.insert(breceiptctrl);

Loading…
Cancel
Save