物品移交记录部分代码

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmRecordsInvoiceVo.java

@@ -0,0 +1,43 @@
+package com.yxt.anrui.scm.api.scmtransferrecords;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 发票
+ * @author: dimengzhe
+ * @date: 2023/6/5
+ **/
+@Data
+public class ScmRecordsInvoiceVo implements Vo {
+    private static final long serialVersionUID = 5607692895870869172L;
+    private String vinSid;
+    //车架号
+    private String vinNo;
+    //开票单位
+    private String invoiceTitle;
+    //开票类型
+    private String invoiceType;
+    //开票名称
+    private String invoicingName;
+    //开票金额
+    private String invoiceAmount;
+    //发票号
+    private String invoiceNo;
+    //移交部门
+    private String transferDept;
+    //移交人
+    private String transferName;
+    //移交备注
+    private String transferRemarks;
+    //发票图片
+    private List<String> filePathList = new ArrayList<>();
+    //接收说明
+    private String receiveRemarks;
+    //接收附件
+    private List<String> receiveFilesList = new ArrayList<>();
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java

@@ -63,4 +63,6 @@ public class ScmTransferRecords extends BaseEntity {
     private String goodsType;
     @ApiModelProperty("移交物品类别key")
     private String goodsTypeKey;
+    @ApiModelProperty("接收说明")
+    private String receiveRemarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java

@@ -6,8 +6,10 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @description: 物品移交记录对外接口
@@ -29,4 +31,8 @@ public interface ScmTransferRecordsFeign {
     @ApiOperation("新增")
     @PostMapping("/saveRecords")
     ResultBean saveRecords(@RequestBody ScmTransferRecordsDto dto);
+
+    @ApiOperation("发票接收确认初始化")
+    @GetMapping("/getInvoiceInfo")
+    ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(@RequestParam("sid") String sid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java

@@ -14,10 +14,12 @@ public class ScmTransferRecordsQuery implements Query {
     private static final long serialVersionUID = 1398412884121486811L;
 
     private String menuUrl;
-
+    @ApiModelProperty("用户sid")
     private String userSid;
-
+    @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("角色sid")
+    private String roleSid;
     @ApiModelProperty("类型：0待接收，1已接收")
     private int type;
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.scm.biz.scmtransferrecords;
 
-import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsDto;
-import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsFeign;
-import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsQuery;
-import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo;
+import com.yxt.anrui.scm.api.scmtransferrecords.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -36,4 +33,9 @@ public class ScmTransferRecordsRest implements ScmTransferRecordsFeign {
     public ResultBean saveRecords(ScmTransferRecordsDto dto) {
         return scmTransferRecordsService.saveRecords(dto);
     }
+
+    @Override
+    public ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(String sid) {
+        return scmTransferRecordsService.getInvoiceInfo(sid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmtransferrecords.*;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -15,6 +17,10 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -25,6 +31,10 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
 
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public PagerVo<ScmTransferRecordsVo> pagerList(PagerQuery<ScmTransferRecordsQuery> pq) {
         QueryWrapper<ScmTransferRecords> qw = new QueryWrapper<>();
@@ -34,6 +44,10 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
                 qw.eq("receiveState", 0);
             } else if (pagerQuery.getType() == 1) {
                 qw.eq("receiveState", 0);
+                //接收开始时间-接收结束时间
+                qw.apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeStart()), "date_format (receiveTime,'%Y-%m-%d') >= date_format('" + pagerQuery.getReceiveTimeStart() + "','%Y-%m-%d')").
+                        apply(StringUtils.isNotBlank(pagerQuery.getReceiveTimeEnd()), "date_format (receiveTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getReceiveTimeEnd() + "','%Y-%m-%d')"
+                        );
             }
             qw.eq("goodsTypeKey", ScmTransferRecordEnum.FP.getCode());
             //合同编号
@@ -44,6 +58,27 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
             if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
                 qw.like("vinNo", pagerQuery.getVinNo());
             }
+            //移交部门
+            if (StringUtils.isNotBlank(pagerQuery.getTransferDept())) {
+                qw.like("transferDept", pagerQuery.getTransferDept());
+            }
+            //移交人
+            if (StringUtils.isNotBlank(pagerQuery.getTransferName())) {
+                qw.like("transferName", pagerQuery.getTransferName());
+            }
+            //创建开始时间-创建结束时间
+            qw.apply(StringUtils.isNotBlank(pagerQuery.getCreateTimeStart()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + pagerQuery.getCreateTimeStart() + "','%Y-%m-%d')").
+                    apply(StringUtils.isNotBlank(pagerQuery.getCreatetimeEnd()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + pagerQuery.getCreatetimeEnd() + "','%Y-%m-%d')"
+                    );
+            //本分公司
+            if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
+                String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
+                qw.eq("useOrgSid", useOrgSid);
+            }
+            //接收角色sid
+            if (StringUtils.isNotBlank(pagerQuery.getRoleSid())) {
+                qw.eq("receiveRoleSid", pagerQuery.getRoleSid());
+            }
         }
         IPage<ScmTransferRecords> page = PagerUtil.queryToPage(pq);
         IPage<ScmTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);
@@ -72,4 +107,28 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
         baseMapper.insert(scmTransferRecords);
         return rb.success();
     }
+
+    public ResultBean<ScmRecordsInvoiceVo> getInvoiceInfo(String sid) {
+        ResultBean<ScmRecordsInvoiceVo> rb = ResultBean.fireFail();
+        ScmRecordsInvoiceVo scmRecordsInvoiceVo = new ScmRecordsInvoiceVo();
+        ScmTransferRecords scmTransferRecords = fetchBySid(sid);
+        BeanUtil.copyProperties(scmTransferRecords, scmRecordsInvoiceVo);
+        ResultBean<FinVehicleInvoice> resultBean = finVehicleInvoiceFeign.selectByVinSids(scmTransferRecords.getVinSid());
+        if (resultBean.getData() != null) {
+            FinVehicleInvoice finVehicleInvoice = resultBean.getData();
+            scmRecordsInvoiceVo.setInvoiceNo(finVehicleInvoice.getInvoiceNo());
+            scmRecordsInvoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString());
+            scmRecordsInvoiceVo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
+            scmRecordsInvoiceVo.setInvoiceType(finVehicleInvoice.getInvoiceType());
+            if (StringUtils.isNotBlank(finVehicleInvoice.getFilePath())) {
+                List<String> filePathList = Arrays.asList(finVehicleInvoice.getFilePath().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                scmRecordsInvoiceVo.setFilePathList(filePathList);
+            }
+        }
+        if (StringUtils.isNotBlank(scmTransferRecords.getReceiveFiles())) {
+            List<String> receiveFileList = Arrays.asList(scmTransferRecords.getReceiveFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+            scmRecordsInvoiceVo.setReceiveFilesList(receiveFileList);
+        }
+        return rb.success().setData(scmRecordsInvoiceVo);
+    }
 }