From 04468d95ce1594980a275eac5279958ad86b622c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 5 Jun 2023 11:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E7=A7=BB=E4=BA=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmTransferRecords.java | 62 +++++++++++++++++++ .../ScmTransferRecordsFeign.java | 26 ++++++++ .../ScmTransferRecordsFeignFallback.java | 12 ++++ .../ScmTransferRecordsVo.java | 38 ++++++++++++ .../ScmTransferRecordsMapper.java | 14 +++++ .../ScmTransferRecordsMapper.xml | 4 ++ .../ScmTransferRecordsRest.java | 17 +++++ .../ScmTransferRecordsService.java | 14 +++++ .../HandoverPrepareVehicleInfoVo.java | 2 +- doc/databases/scm_tables.sql | 1 + 10 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java new file mode 100644 index 0000000000..bd10543348 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java @@ -0,0 +1,62 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @description: 物品移交记录 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class ScmTransferRecords extends BaseEntity { + private static final long serialVersionUID = 9087540680738846795L; + + @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") + private String transferSid; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交部门sid") + private String transferDeptSid; + @ApiModelProperty("移交部门") + private String transferDept; + @ApiModelProperty("移交备注") + private String transferRemarks; + @ApiModelProperty("移交附件") + private String transferFiles; + @ApiModelProperty("接收角色sid") + private String receiveRoleSid; + @ApiModelProperty("接收人sid") + private String receiveSid; + @ApiModelProperty("接收人") + private String receiveName; + @ApiModelProperty("接收部门sid") + private String receiveDeptSid; + @ApiModelProperty("接收部门") + private String receiveDept; + @ApiModelProperty("接收状态") + private int receiveState; + @ApiModelProperty("接收时间") + private Date receiveTime; + @ApiModelProperty("接收附件") + private String receiveFiles; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java new file mode 100644 index 0000000000..5ae8fc772a --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +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; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 物品移交记录对外接口 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Api(tags = "物品移交记录") +@FeignClient( + contextId = "anrui-scm-ScmTransferRecords", + name = "anrui-scm", + path = "v1/ScmTransferRecords", + fallback = ScmTransferRecordsFeignFallback.class) +public interface ScmTransferRecordsFeign { + + @ApiOperation("分页列表") + @PostMapping("/pagerList") + public ResultBean> getSaleOrders(@RequestBody PagerQuery pq); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java new file mode 100644 index 0000000000..d534958933 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +import org.springframework.stereotype.Component; + +/** + * @description: 物品移交记录 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Component +public class ScmTransferRecordsFeignFallback { +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java new file mode 100644 index 0000000000..890d06360e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class ScmTransferRecordsVo implements Vo { + private static final long serialVersionUID = -2648064038807719461L; + + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("创建时间") + private String createTime; + + //车架号 + @ApiModelProperty("车架号") + private String vinNo; + //开票单位 + //开票类型 + //开票名称 + //开票金额 + //发票号 + //移交部门 + @ApiModelProperty("移交部门") + private String transferDept; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交备注") + private String transferRemarks; + + private String sid; +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java new file mode 100644 index 0000000000..28de8c29e5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.scm.biz.scmtransferrecords; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; +import org.apache.ibatis.annotations.Mapper; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Mapper +public interface ScmTransferRecordsMapper extends BaseMapper { +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml new file mode 100644 index 0000000000..27bcd4e7b1 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java new file mode 100644 index 0000000000..7e6c2318fd --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.scm.biz.scmtransferrecords; + +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 物品移交记录 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Api(tags = "物品移交记录") +@RestController +@RequestMapping("v1/ScmTransferRecords") +public class ScmTransferRecordsRest implements ScmTransferRecordsFeign { +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java new file mode 100644 index 0000000000..7bee0f160f --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java @@ -0,0 +1,14 @@ +package com.yxt.anrui.scm.biz.scmtransferrecords; + +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Service +public class ScmTransferRecordsService extends MybatisBaseService { +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java index 8d8b8f51ee..ade14fd1fc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java @@ -10,7 +10,7 @@ public class HandoverPrepareVehicleInfoVo implements Vo { private static final long serialVersionUID = 7834545131984653302L; @ApiModelProperty("sid") - @JsonProperty("vinSid") +// @JsonProperty("vinSid") private String sid; @ApiModelProperty("交车申请表sid") private String mainSid; // 交车申请表sid diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index 2a3aab453d..26c59aa514 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -949,6 +949,7 @@ 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 '移交物品名称', + `contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号', `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', `vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', `transferNum` int(32) DEFAULT NULL COMMENT '移交数量',