欠款出厂调整

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDetailsVo.java

@@ -31,6 +31,7 @@ import com.yxt.common.core.vo.Vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -61,6 +62,12 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
     private String remarks;
     @ApiModelProperty("制单人sid")
     private String createBySid;
+    @ApiModelProperty("申请日期")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
+    private Date createTime;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据编号")
@@ -88,7 +95,7 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
 	@ApiModelProperty("工单欠款金额")
     private BigDecimal pairArrearsMoney; // 工单欠款金额
 	@ApiModelProperty("附件路径")
-    private List<AsArrearsoutApplyFile> filePaths; // 附件路径(多个附件之间英文逗号隔开)
+    private List<AsArrearsoutApplyFile> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("分公司名称")
@@ -115,7 +122,7 @@ public class AsArrearsoutApplyDetailsVo implements Vo {
     @ApiModelProperty("结算日期")
     private Date balanceDate;
     @ApiModelProperty("工单类型key")
-    private String billTypeKey;
+    private Integer billTypeKey;
     @ApiModelProperty("工单类型value")
     private String billTypeValue;
     @ApiModelProperty("客户联系电话")

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyDto.java

@@ -116,7 +116,7 @@ public class AsArrearsoutApplyDto implements Dto {
     @ApiModelProperty("结算日期")
     private Date balanceDate;
     @ApiModelProperty("工单类型key")
-    private String billTypeKey;
+    private Integer billTypeKey;
     @ApiModelProperty("工单类型value")
     private String billTypeValue;
     @ApiModelProperty("客户联系电话")

yxt-as/src/main/java/com/yxt/anrui/as/api/asarrearsoutapply/AsArrearsoutApplyVo.java

@@ -60,7 +60,7 @@ public class AsArrearsoutApplyVo implements Vo {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("创建组织名称")
-    private String createOrgName;
+    private String useOrgName;
     @ApiModelProperty("申请部门名称")
     private String deptName;
     @ApiModelProperty("申请人")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyRest.java

@@ -89,6 +89,14 @@ public class AsArrearsoutApplyRest {
 		return asArrearsoutApplyService.delAll(sids);
 	}
 
+	@ApiOperation("初始化")
+	@GetMapping("/init/{gdSid}")
+	public ResultBean<AsArrearsoutApplyDetailsVo> init(@PathVariable("gdSid") String gdSid){
+		ResultBean rb = ResultBean.fireFail();
+		AsArrearsoutApplyDetailsVo vo = asArrearsoutApplyService.init(gdSid);
+		return rb.success().setData(vo);
+	}
+
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<AsArrearsoutApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java

@@ -32,6 +32,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.as.api.asarrearsoutapply.*;
 import com.yxt.anrui.as.api.asarrearsoutapply.flowable.*;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
+import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
+import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
+import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
 import com.yxt.anrui.as.feign.base.billno.Rule;
 import com.yxt.anrui.as.feign.flowable.flow.*;
 import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery;
@@ -93,6 +97,10 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
     private MessageFeign messageFeign;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private AsBusrepairBillService asBusrepairBillService;
+    @Autowired
+    private AsBusrepairBillVechService asBusrepairBillVechService;
 
     public PagerVo<AsArrearsoutApplyVo> listPageVo(PagerQuery<AsArrearsoutApplyQuery> pq) {
         AsArrearsoutApplyQuery query = pq.getParams();
@@ -216,6 +224,24 @@ public class AsArrearsoutApplyService extends MybatisBaseService<AsArrearsoutApp
         return vo;
     }
 
+    public AsArrearsoutApplyDetailsVo init(String gdSid) {
+        AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(gdSid);
+        AsArrearsoutApplyDetailsVo asArrearsoutApplyDetailsVo = new AsArrearsoutApplyDetailsVo();
+        asArrearsoutApplyDetailsVo.setPairBillSid(gdSid);
+        asArrearsoutApplyDetailsVo.setPairBillNo(asBusrepairBill.getBillNo());
+        asArrearsoutApplyDetailsVo.setCustomerSid(asBusrepairBill.getCustomerSid());
+        asArrearsoutApplyDetailsVo.setCustomerName(asBusrepairBill.getCustomerName());
+        asArrearsoutApplyDetailsVo.setCustomerPhone(asBusrepairBill.getMobile());
+        AsBusrepairBillVech asBusrepairBillVech = asBusrepairBillVechService.fetchByBillSid(gdSid);
+        asArrearsoutApplyDetailsVo.setVinNo(asBusrepairBillVech.getVinNo());
+        asArrearsoutApplyDetailsVo.setVehMark(asBusrepairBillVech.getVehMark());
+        asArrearsoutApplyDetailsVo.setUseOrgSid(asBusrepairBill.getUseOrgSid());
+        asArrearsoutApplyDetailsVo.setUseOrgName(asBusrepairBill.getUseOrgName());
+        asArrearsoutApplyDetailsVo.setBillTypeKey(asBusrepairBill.getBillTypeKey());
+        asArrearsoutApplyDetailsVo.setBillTypeValue(asBusrepairBill.getBillType());
+        return asArrearsoutApplyDetailsVo;
+    }
+
     public ResultBean submit(SubmitAsArrearsoutApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         AsArrearsoutApply asArrearsoutApply = fetchBySid(dto.getSid());