entity

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDoc.java

@@ -5,12 +5,12 @@ import lombok.Data;
 @Data
 public class BizDoc {
     private String id;
-    private Integer cid;
+    private Integer cid;//创建人id
     private String cname;
     private Long ctime;
-    private Integer vid;
+    private Integer vid;//审核人id
     private String vname;
     private Long vtime;
-    private Integer status;
-    private String remark;
+    private Integer status;//0拟定，1待审核，2已审核
+    private String remark;//备注
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocHistory.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
+//单据状态变更记录表
 public class BizDocHistory {
     private Integer id;
     private String pid;

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocSub.java

@@ -7,8 +7,8 @@ import java.math.BigDecimal;
 @Data
 public class BizDocSub {
     private Integer id;
-    private String pid;
-    private Integer cid;
+    private String pid;//采购入/出库id
+    private Integer cid;//商品分类id
     private String cname;
-    private BigDecimal num;
+    private BigDecimal num;//入/出库数量
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInbound.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+//采购入库
 public class BizPurchaseInbound extends BizDoc {
-    private String pid;
+    private String pid;//采购订单id
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInboundSub.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+//采购入库子表
 public class BizPurchaseInboundSub extends BizDocSub {
 
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrder.java

@@ -9,10 +9,11 @@ import java.math.BigDecimal;
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+//采购订单表
 public class BizPurchaseOrder extends BizDoc {
-    private Integer sid;
+    private Integer sid;//供应商id
     private String sname;
-    private Integer finish;
+    private Integer finish;//0拟定，1待审核，2已审核
     private Long ftime;
-    private BigDecimal total;
+    private BigDecimal total;//总额
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrderSub.java

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 @Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
+//采购订单子表
 public class BizPurchaseOrderSub extends BizDocSub {
     private BigDecimal price;
     private BigDecimal remainNum;

java/local/src/main/java/cn/toesbieya/jxc/model/entity1/BasicInfo.java

@@ -0,0 +1,20 @@
+package cn.toesbieya.jxc.model.entity1;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.data.annotation.Id;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class BasicInfo extends Change{
+    @Id
+    private Integer id;
+    private String name;
+    private Integer manufactureId;
+    private Integer typeId;
+    private Integer riskId;
+
+
+}

java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Change.java

@@ -0,0 +1,11 @@
+package cn.toesbieya.jxc.model.entity1;
+
+import lombok.Data;
+
+@Data
+public class Change {
+    private Integer creatorId;
+    private Long createTime;
+    private Integer updateId;
+    private Long updateTime;
+}

java/local/src/main/java/cn/toesbieya/jxc/model/entity1/DetailInfo.java

@@ -0,0 +1,23 @@
+package cn.toesbieya.jxc.model.entity1;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.data.annotation.Id;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class DetailInfo extends Change{
+    @Id
+    private Integer id;
+    private Integer basicId;
+    private Long productionDate;
+    private Integer effective;
+    private Integer batchId;
+    private String specification;
+    private Integer unitId;
+    private Integer status;
+    private String remark;
+
+}

java/local/src/main/java/cn/toesbieya/jxc/model/entity1/Location.java

@@ -0,0 +1,19 @@
+package cn.toesbieya.jxc.model.entity1;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.data.annotation.Id;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class Location extends Change{
+    @Id
+    private Integer id;
+    private String name;
+    private Integer containerId;
+    private Integer storehouseId;
+    private Integer status;
+
+}

java/local/src/main/resources/application-local.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/my?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
+    url: jdbc:mysql://localhost:3306/jxc_admin?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true
     username: root
-    password: root
+    password: 123456
   redis:
     host: localhost
     port: 6379
@@ -12,6 +12,6 @@ socket:
   port: 12580
 
 qiniu:
-  access-key:
-  secret-key:
-  bucket:
+  access-key: xrxEn5NVR1M33VQa82yE16XSMdbeSYUlx-4_sio3
+  secret-key: yj1r1vv8f-0p7anD2PRzL1kiw0YLPavefGjLSUgx
+  bucket: munuan

java/local/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8081
   tomcat:
     #指定tomcat临时目录，否则每次启动都会在用户临时文件夹里创建一个tomcat文件夹
-    basedir: C:\static
+    basedir: D:\springboot-tomcat-temp
 
 spring:
   profiles: