物品移交记录部分代码

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

@@ -0,0 +1,45 @@
+package com.yxt.anrui.scm.api.scmtransferrecords;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/6/5
+ **/
+@Data
+public class ScmTransferRecordsDto implements Dto {
+    private static final long serialVersionUID = 4444291069272893613L;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("移交物品sid")
+    private String goodsSid;
+    @ApiModelProperty("移交物品名称")
+    private String goodsName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("移交数量")
+    private int transferNum;
+    @ApiModelProperty("物品单位")
+    private String goodsUnit;
+    @ApiModelProperty("移交人sid(userSid)")
+    private String transferSid;
+    @ApiModelProperty("移交人")
+    private String transferName;
+    @ApiModelProperty("移交部门sid")
+    private String transferDeptSid;
+    @ApiModelProperty("移交备注")
+    private String transferDept;
+    @ApiModelProperty("移交附件")
+    private List<String> transferFiles;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+}

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

@@ -1,7 +1,13 @@
 package 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;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @description: 物品移交记录对外接口
@@ -16,7 +22,11 @@ import org.springframework.cloud.openfeign.FeignClient;
         fallback = ScmTransferRecordsFeignFallback.class)
 public interface ScmTransferRecordsFeign {
 
- /*   @ApiOperation("分页列表")
+    @ApiOperation("分页列表")
     @PostMapping("/pagerList")
-    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(@RequestBody PagerQuery<AppBusSalesOrderQuery> pq);*/
+    public ResultBean<PagerVo<ScmTransferRecordsVo>> pagerList(@RequestBody PagerQuery<ScmTransferRecordsQuery> pq);
+
+    @ApiOperation("新增")
+    @PostMapping("/saveRecords")
+    ResultBean saveRecords(@RequestBody ScmTransferRecordsDto dto);
 }

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

@@ -0,0 +1,23 @@
+package com.yxt.anrui.scm.api.scmtransferrecords;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/6/5
+ **/
+@Data
+public class ScmTransferRecordsQuery implements Query {
+    private static final long serialVersionUID = 1398412884121486811L;
+
+    private String menuUrl;
+
+    private String userSid;
+
+    private String orgPath;
+    @ApiModelProperty("类型：0待接收，1已接收")
+    private int type;
+}

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

@@ -17,15 +17,18 @@ public class ScmTransferRecordsVo implements Vo {
     private String contractNo;
     @ApiModelProperty("创建时间")
     private String createTime;
-
-    //车架号
     @ApiModelProperty("车架号")
     private String vinNo;
     //开票单位
+    private String invoiceTitle;
     //开票类型
+    private String invoiceType;
     //开票名称
+    private String invoicingName;
     //开票金额
+    private String invoiceAmount;
     //发票号
+    private String invoiceNo;
     //移交部门
     @ApiModelProperty("移交部门")
     private String transferDept;
@@ -33,6 +36,6 @@ public class ScmTransferRecordsVo implements Vo {
     private String transferName;
     @ApiModelProperty("移交备注")
     private String transferRemarks;
-
+    @ApiModelProperty("sid")
     private String sid;
 }

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

@@ -1,8 +1,13 @@
 package com.yxt.anrui.scm.biz.scmtransferrecords;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords;
+import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @description:
@@ -11,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
  **/
 @Mapper
 public interface ScmTransferRecordsMapper extends BaseMapper<ScmTransferRecords> {
+    IPage<ScmTransferRecordsVo> pagerList(IPage<ScmTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<ScmTransferRecords> qw);
 }

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

@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.scm.biz.scmtransferrecords.ScmTransferRecordsMapper">
+    <select id="pagerList" resultType="com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo">
+        select sid,
+               contractNo,
+               vinNo,
+               transferDept,
+               transferName,
+               transferRemarks,
+               DATE_FORMAT(createTime, '%Y-%m-%d')
+        from scm_transfer_records
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -1,7 +1,14 @@
 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.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,4 +21,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("v1/ScmTransferRecords")
 public class ScmTransferRecordsRest implements ScmTransferRecordsFeign {
+
+    @Autowired
+    private ScmTransferRecordsService scmTransferRecordsService;
+
+    @Override
+    public ResultBean<PagerVo<ScmTransferRecordsVo>> pagerList(PagerQuery<ScmTransferRecordsQuery> pq) {
+        ResultBean<PagerVo<ScmTransferRecordsVo>> rb = ResultBean.fireFail();
+        PagerVo<ScmTransferRecordsVo> pv = scmTransferRecordsService.pagerList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean saveRecords(ScmTransferRecordsDto dto) {
+        return scmTransferRecordsService.saveRecords(dto);
+    }
 }

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

@@ -1,7 +1,17 @@
 package com.yxt.anrui.scm.biz.scmtransferrecords;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords;
+import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsDto;
+import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsQuery;
+import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -11,4 +21,34 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRecordsMapper, ScmTransferRecords> {
+
+    public PagerVo<ScmTransferRecordsVo> pagerList(PagerQuery<ScmTransferRecordsQuery> pq) {
+        QueryWrapper<ScmTransferRecords> qw = new QueryWrapper<>();
+        ScmTransferRecordsQuery pagerQuery = pq.getParams();
+        if (pagerQuery != null) {
+            if (pagerQuery.getType() == 0) {
+                qw.eq("receiveState", 0);
+            } else if (pagerQuery.getType() == 1) {
+                qw.eq("receiveState", 0);
+            }
+
+        }
+        IPage<ScmTransferRecords> page = PagerUtil.queryToPage(pq);
+        IPage<ScmTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);
+        for (ScmTransferRecordsVo record : pagging.getRecords()) {
+
+        }
+        PagerVo<ScmTransferRecordsVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveRecords(ScmTransferRecordsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmTransferRecords scmTransferRecords = new ScmTransferRecords();
+        BeanUtil.copyProperties(dto, scmTransferRecords);
+        scmTransferRecords.setReceiveState(0);
+        scmTransferRecords.setCreateBySid(dto.getTransferSid());
+        baseMapper.insert(scmTransferRecords);
+        return rb.success();
+    }
 }