Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","historical_inventory_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","fixed_assets_info");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FixedAssetsInfoController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录固定资产信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-12
+ */
+@RestController
+@RequestMapping("/fixedAssetsInfo")
+public class FixedAssetsInfoController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FixedAssetsInfo.java

@@ -0,0 +1,115 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录固定资产信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("fixed_assets_info")
+public class FixedAssetsInfo extends BaseModel<FixedAssetsInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 仓库id
+     */
+    private String baseId;
+    /**
+     * 部门ID
+     */
+    private String deptId;
+    /**
+     * 所属部门/库点
+     */
+    private String deptAndWarehouse;
+    /**
+     * 负责人
+     */
+    private String leadingCadre;
+    /**
+     * 电话
+     */
+    private String thePhone;
+    /**
+     * 物品名称
+     */
+    private String itemName;
+    /**
+     * 经营类型
+     */
+    private String businessType;
+    /**
+     * 经营类型key(1自营3合营)
+     */
+    private String businessTypeKey;
+    /**
+     * 采购数量
+     */
+    private Long purchaseQuantity;
+    /**
+     * 采购单价（元）
+     */
+    private Double purchasePrice;
+    /**
+     * 当前单价（元）
+     */
+    private Double currentPrice;
+    /**
+     * 总价（元）
+     */
+    private Double totalPrice;
+    /**
+     * 采购日期
+     */
+    private Date purchaseDate;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 状态标识（1在用3闲置5报废7转卖）
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 审核状态
+     */
+    private String approveStatus;
+    /**
+     * 工作流ID
+     */
+    private String workflowId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FixedAssetsInfoMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FixedAssetsInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录固定资产信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-12
+ */
+public interface FixedAssetsInfoMapper extends BaseMapper<FixedAssetsInfo> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFixedAssetsInfoService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FixedAssetsInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录固定资产信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-12
+ */
+public interface IFixedAssetsInfoService extends IService<FixedAssetsInfo> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FixedAssetsInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.FixedAssetsInfo;
+import com.yh.saas.plugin.yiliangyiyun.mapper.FixedAssetsInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IFixedAssetsInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录固定资产信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-12
+ */
+@Service
+public class FixedAssetsInfoServiceImpl extends ServiceImpl<FixedAssetsInfoMapper, FixedAssetsInfo> implements IFixedAssetsInfoService {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/FixedAssetsInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.yh.saas.plugin.yiliangyiyun.mapper.FixedAssetsInfoMapper">
+
+</mapper>