新增实体

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/jarRepositories.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />

pom.xml

@@ -14,13 +14,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <org.springframework.boot.version>2.3.5.RELEASE</org.springframework.boot.version>
+        <org.springframework.boot.version>2.4.0</org.springframework.boot.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <com.alibaba.druid.version>1.2.5</com.alibaba.druid.version>
         <com.auth0.jwt.version>3.9.0</com.auth0.jwt.version>
         <mssql-jdbc>9.2.1.jre8</mssql-jdbc>
         <commons-collections>3.2.2</commons-collections>
         <commons-lang>2.6</commons-lang>
+        <lombok>1.18.8</lombok>
+        <knife4j>3.0.3</knife4j>
+        <hutool>5.8.0.M3</hutool>
     </properties>
 
     <dependencyManagement>
@@ -77,6 +80,21 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${org.springframework.boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <version>${knife4j}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutool}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -138,6 +156,18 @@
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/topsunit/scanservice/ximai/entity/Cmsmb.java

+package com.topsunit.scanservice.ximai.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * <p>Title: Cmsmb</p>
+ * <p>Description: 工厂信息档</p>
+ *
+ * @author xi.feng
+ * @version V1.0
+ * @date 2021/10/29
+ */
+@Data
+@Entity
+public class Cmsmb extends EntityBase {
+    /**
+     * 仓库编号
+     */
+    @Id
+    @ApiModelProperty("工厂编号")
+    private String mc001;
+    /**
+     *仓库名称
+     */
+    @ApiModelProperty("工厂名称")
+    private String mc002;
+
+}

src/main/java/com/topsunit/scanservice/ximai/entity/Cmsmc.java

 package com.topsunit.scanservice.ximai.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -11,31 +14,29 @@ import javax.persistence.Id;
  * @version V1.0
  * @date 2021/10/29
  */
+@Data
 @Entity
 public class Cmsmc extends EntityBase {
     /**
      * 仓库编号
      */
     @Id
+    @ApiModelProperty("仓库编号")
     private String mc001;
     /**
-     * 仓库名称
+     *仓库名称
      */
+    @ApiModelProperty("仓库名称")
     private String mc002;
+    /**
+     * 工厂编号
+     */
+    @ApiModelProperty("工厂编号")
+    private String mc003;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String mc007;
 
-    public String getMc001() {
-        return mc001;
-    }
-
-    public void setMc001(String mc001) {
-        this.mc001 = mc001;
-    }
-
-    public String getMc002() {
-        return mc002;
-    }
-
-    public void setMc002(String mc002) {
-        this.mc002 = mc002;
-    }
 }

src/main/java/com/topsunit/scanservice/ximai/entity/Copma.java

+package com.topsunit.scanservice.ximai.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+/**
+ * <p>Title: Purma</p>
+ * <p>Description: 客户基本信息档</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/15
+ */
+@Data
+@Entity
+public class Copma extends EntityBase {
+
+    @Id
+    @ApiModelProperty("客户编号")
+    private String ma001;
+
+    @ApiModelProperty("客户简称")
+    private String ma002;
+
+    @ApiModelProperty("客户全称")
+    private String ma003;
+
+    /**
+     * 1:已核准、2:尚待核准、3:不准交易[DEF:1]//20030312 5.0 P00-03030003 ADD BY 28995↓
+     */
+    @ApiModelProperty("核准状态")
+    private String ma097;
+
+    @ApiModelProperty("备注")
+    private String ma049;
+
+}

src/main/java/com/topsunit/scanservice/ximai/entity/Invma.java

+package com.topsunit.scanservice.ximai.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+/**
+ * <p>Title: Invmb</p>
+ * <p>Description: 品号基本信息档</p>
+ *
+ * @author xi.feng
+ * @version V1.0
+ * @date 2021/10/26
+ */
+@Data
+@Entity
+@IdClass(InvmaId.class)
+public class Invma extends EntityBase {
+    @Id
+    @ApiModelProperty("分类方式")
+    private String ma001;
+    @Id
+    @ApiModelProperty("品号类别编号")
+    private String ma002;
+    @ApiModelProperty("品号类别名称")
+    private String ma003;
+}

src/main/java/com/topsunit/scanservice/ximai/entity/InvmaId.java

+package com.topsunit.scanservice.ximai.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * <p>Title: InvmdId</p>
+ * <p>Description: 品号换算单位档</p>
+ *
+ * @author xi.feng
+ * @version V1.0
+ */
+@Data
+public class InvmaId implements Serializable {
+
+    public InvmaId() {
+    }
+
+    public InvmaId(String ma001, String ma002) {
+        this.ma001 = String.format("%1$-20s", ma001);;
+        this.ma002 = String.format("%1$-4s", ma002);;
+    }
+
+    /**
+     * 品号
+     */
+    private String ma001;
+
+    /**
+     * 换算单位
+     */
+    private String ma002;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        InvmaId invmdId = (InvmaId) o;
+        return ma001.equals(invmdId.ma001) && ma002.equals(invmdId.ma002);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(ma001, ma002);
+    }
+}

src/main/java/com/topsunit/scanservice/ximai/entity/Invmb.java

 package com.topsunit.scanservice.ximai.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -11,79 +14,52 @@ import javax.persistence.Id;
  * @version V1.0
  * @date 2021/10/26
  */
+@Data
 @Entity
 public class Invmb extends EntityBase {
     @Id
+    @ApiModelProperty("品号")
     private String mb001;
+    @ApiModelProperty("品名")
     private String mb002;
+    @ApiModelProperty("规格")
     private String mb003;
+    @ApiModelProperty("内部图号")
+    private String udf07;
+    @ApiModelProperty("库存单位")
     private String mb004;
+    @ApiModelProperty("品号类别")
+    private String mb005;
+    /**
+     * N:不需要、Y:需要不检查库存量、W:仅需警告、T:需要且检查库存量
+     */
+    @ApiModelProperty("批号管理")
     private String mb022;
-    private String mb029;
-    private String mb043;
-    private String mb149;
-
-    public String getMb001() {
-        return mb001;
-    }
-
-    public void setMb001(String mb001) {
-        this.mb001 = mb001;
-    }
-
-    public String getMb002() {
-        return mb002;
-    }
-
-    public void setMb002(String mb002) {
-        this.mb002 = mb002;
-    }
-
-    public String getMb003() {
-        return mb003;
-    }
-
-    public void setMb003(String mb003) {
-        this.mb003 = mb003;
-    }
 
-    public String getMb004() {
-        return mb004;
-    }
-
-    public void setMb004(String mb004) {
-        this.mb004 = mb004;
-    }
-
-    public String getMb022() {
-        return mb022;
-    }
-
-    public void setMb022(String mb022) {
-        this.mb022 = mb022;
-    }
-
-    public String getMb029() {
-        return mb029;
-    }
-
-    public void setMb029(String mb029) {
-        this.mb029 = mb029;
-    }
-
-    public String getMb043() {
-        return mb043;
-    }
-
-    public void setMb043(String mb043) {
-        this.mb043 = mb043;
-    }
+    @ApiModelProperty("客户图号")
+    private String mb029;
 
-    public String getMb149() {
-        return mb149;
-    }
+    /**
+     * 0:免检、1:抽检(减量)、2:抽检(正常)、3:抽检(加严)、4:全检     //880820 MODI BY 551
+     */
+    @ApiModelProperty("检验方式")
+    private String mb043;
 
-    public void setMb149(String mb149) {
-        this.mb149 = mb149;
-    }
+    @ApiModelProperty("计价单位")
+    private String mb149;
+    @ApiModelProperty("客户品号")
+    private String udf01;
+    @ApiModelProperty("主要仓库")
+    private String mb017;
+
+    @ApiModelProperty("会计")
+    private String test1;
+    /**
+     * Y:已核准、y:尚待核准、N:不准交易[DEF:"Y"]
+     */
+    @ApiModelProperty("核准状态")
+    private String mb109;
+
+    @ApiModelProperty("备注")
+    private String mb028;
 }

src/main/java/com/topsunit/scanservice/ximai/entity/Invml.java

 package com.topsunit.scanservice.ximai.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
@@ -10,6 +13,7 @@ import java.math.BigDecimal;
  * Date:     2021/10/29 21:42
  * Description: 品号仓库库位档
  */
+@Data
 @Entity
 @IdClass(InvmlId.class)
 public class Invml extends EntityBase {
@@ -17,133 +21,64 @@ public class Invml extends EntityBase {
      * 品号
      */
     @Id
+    @ApiModelProperty("品号")
     private String ml001;
 
     /**
      * 仓库
      */
     @Id
+    @ApiModelProperty("仓库")
     private String ml002;
 
     /**
      * 库位
      */
     @Id
+    @ApiModelProperty("库位")
     private String ml003;
 
     /**
      * 批号
      */
     @Id
+    @ApiModelProperty("批号")
     private String ml004;
 
     /**
      * 库存数量
      */
+    @ApiModelProperty("库存数量")
     private BigDecimal ml005;
 
     /**
      * 库存包装数量
      */
+    @ApiModelProperty("库存包装数量")
     private BigDecimal ml006;
 
     /**
      * 预留字段 库存金额
      */
+    @ApiModelProperty("库存金额")
     private BigDecimal ml007;
 
     /**
      * 上次盘点日
      */
+    @ApiModelProperty("上次盘点日")
     private String ml008;
 
     /**
      * 最近入库日
      */
+    @ApiModelProperty("最近入库日")
     private String ml009;
 
     /**
      * 最近出库日
      */
+    @ApiModelProperty("最近出库日")
     private String ml010;
 
-    public String getMl001() {
-        return ml001;
-    }
-
-    public void setMl001(String ml001) {
-        this.ml001 = ml001;
-    }
-
-    public String getMl002() {
-        return ml002;
-    }
-
-    public void setMl002(String ml002) {
-        this.ml002 = ml002;
-    }
-
-    public String getMl003() {
-        return ml003;
-    }
-
-    public void setMl003(String ml003) {
-        this.ml003 = ml003;
-    }
-
-    public String getMl004() {
-        return ml004;
-    }
-
-    public void setMl004(String ml004) {
-        this.ml004 = ml004;
-    }
-
-    public BigDecimal getMl005() {
-        return ml005;
-    }
-
-    public void setMl005(BigDecimal ml005) {
-        this.ml005 = ml005;
-    }
-
-    public BigDecimal getMl006() {
-        return ml006;
-    }
-
-    public void setMl006(BigDecimal ml006) {
-        this.ml006 = ml006;
-    }
-
-    public BigDecimal getMl007() {
-        return ml007;
-    }
-
-    public void setMl007(BigDecimal ml007) {
-        this.ml007 = ml007;
-    }
-
-    public String getMl008() {
-        return ml008;
-    }
-
-    public void setMl008(String ml008) {
-        this.ml008 = ml008;
-    }
-
-    public String getMl009() {
-        return ml009;
-    }
-
-    public void setMl009(String ml009) {
-        this.ml009 = ml009;
-    }
-
-    public String getMl010() {
-        return ml010;
-    }
-
-    public void setMl010(String ml010) {
-        this.ml010 = ml010;
-    }
 }

src/main/java/com/topsunit/scanservice/ximai/entity/Purma.java

 package com.topsunit.scanservice.ximai.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -11,52 +15,39 @@ import javax.persistence.Id;
  * @version V1.0
  * @date 2021/10/26
  */
+@Data
 @Entity
 public class Purma extends EntityBase {
+
     @Id
+    @ApiModelProperty("供应商编号")
     private String ma001;
-    private String ma003;
-    private String ma005;
-    private String ma021;
-    private String ma030;
 
-    public String getMa001() {
-        return ma001;
-    }
+    @ApiModelProperty("简称")
+    private String ma002;
 
-    public void setMa001(String ma001) {
-        this.ma001 = ma001;
-    }
-
-    public String getMa003() {
-        return ma003;
-    }
-
-    public void setMa003(String ma003) {
-        this.ma003 = ma003;
-    }
+    @ApiModelProperty("公司全称")
+    private String ma003;
 
-    public String getMa005() {
-        return ma005;
-    }
+    @ApiModelProperty("税号")
+    private String ma005;
 
-    public void setMa005(String ma005) {
-        this.ma005 = ma005;
-    }
+    /**
+     * 1:已核准、2:尚待核准、3:不准交易
+     */
+    @ApiModelProperty("核准状态")
+    private String ma016;
 
-    public String getMa021() {
-        return ma021;
-    }
+    @ApiModelProperty("交易币种")
+    private String ma021;
 
-    public void setMa021(String ma021) {
-        this.ma021 = ma021;
-    }
+    /**
+     * 1.二联式、2.三联式、3.二联式收银机发票、4.三联式收银机发票、5.电子计算机发票、6.免用统一发票、S.可抵扣专用发票、B.普通发票、T.运输发票、N.不可抵扣专用发票 A.农产品收购凭证、G.海关代征完税凭证、W.废旧物资收购凭证、Z.其他 //901025 S06-9009036 MODI A~Z   //8
+     */
+    @ApiModelProperty("发票种类")
+    private String ma030;
 
-    public String getMa030() {
-        return ma030;
-    }
+    @ApiModelProperty("备注")
+    private String ma040;
 
-    public void setMa030(String ma030) {
-        this.ma030 = ma030;
-    }
 }