物品移交记录部分代码

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

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.api.scmtransferrecords;
+
+/**
+ * @description: 物品移交类型
+ * @author: dimengzhe
+ * @date: 2023/6/5
+ **/
+public enum ScmTransferRecordEnum {
+
+
+    FP("01", "发票"),
+    HGZ("02", "合格证"),
+    ;
+    private final String code;
+    private final String remarks;
+
+    ScmTransferRecordEnum(String code, String remarks) {
+        this.code = code;
+        this.remarks = remarks;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+}

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

@@ -59,4 +59,8 @@ public class ScmTransferRecords extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
+    @ApiModelProperty("移交物品类别")
+    private String goodsType;
+    @ApiModelProperty("移交物品类别key")
+    private String goodsTypeKey;
 }

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

@@ -42,4 +42,9 @@ public class ScmTransferRecordsDto implements Dto {
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
+
+    @ApiModelProperty("移交物品类别")
+    private String goodsType;
+    @ApiModelProperty("移交物品类别key")
+    private String goodsTypeKey;
 }

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

@@ -3,10 +3,7 @@ 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.anrui.scm.api.scmtransferrecords.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -31,7 +28,7 @@ public class ScmTransferRecordsService extends MybatisBaseService<ScmTransferRec
             } else if (pagerQuery.getType() == 1) {
                 qw.eq("receiveState", 0);
             }
-
+            qw.eq("goodsTypeKey", ScmTransferRecordEnum.FP.getCode());
         }
         IPage<ScmTransferRecords> page = PagerUtil.queryToPage(pq);
         IPage<ScmTransferRecordsVo> pagging = baseMapper.pagerList(page, qw);

doc/databases/scm_tables.sql

@@ -949,6 +949,8 @@ CREATE TABLE `scm_transfer_records`
     `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
     `goodsSid`        varchar(64)          DEFAULT NULL COMMENT '移交物品sid',
     `goodsName`       varchar(64)          DEFAULT NULL COMMENT '移交物品名称',
+    `goodsType`       varchar(64)          DEFAULT NULL COMMENT '移交物品类别',
+    `goodsTypeKey`    varchar(64)          DEFAULT NULL COMMENT '移交物品类别Key',
     `contractNo`      varchar(200)         DEFAULT NULL COMMENT '合同编号',
     `vinNo`           varchar(64)          DEFAULT NULL COMMENT '车架号',
     `vinSid`          varchar(64)          DEFAULT NULL COMMENT '车辆sid',