商品信息数据库新增字段

docs/new_sql.sql

@@ -10,3 +10,36 @@ ADD COLUMN invoice_type VARCHAR(1)  DEFAULT '' COMMENT '发票类型：0-普通
 ADD COLUMN contract_upload VARCHAR(1000) DEFAULT '' COMMENT '合同附件存储路径';
 
 
+-- 产品信息表  新增系统sku、无动销提醒周期
+ALTER TABLE jsh_material
+ADD COLUMN system_sku VARCHAR(50) DEFAULT '' COMMENT '系统sku',
+ADD COLUMN moving_pin_reminder_cycle VARCHAR(20) DEFAULT '' COMMENT '无动销提醒周期';
+
+-- 产品信息表  删除制造商、保质期天数、仓位货架
+ALTER TABLE jsh_material
+DROP mfrs,
+DROP expiry_num,
+DROP position;
+
+-- 产品价格扩展信息表  新增生产日期、保质期天数、供应商id、批次号、库存、仓库id、仓位货架
+ALTER TABLE jsh_material_extend
+ADD COLUMN production_date DATE DEFAULT NULL COMMENT '生产日期',
+ADD COLUMN expiry_num INT DEFAULT NULL COMMENT '保质期天数',
+ADD COLUMN supplier_id BIGINT DEFAULT NULL COMMENT '供应商id',
+ADD COLUMN batch_number VARCHAR(255) DEFAULT '' COMMENT '批次号',
+ADD COLUMN inventory DECIMAL(24,6) DEFAULT NULL COMMENT '库存',
+ADD COLUMN depot_id BIGINT DEFAULT NULL COMMENT '仓库id',
+ADD COLUMN position VARCHAR(255) DEFAULT '' COMMENT '仓位货架';
+
+-- 单据主表  新增凭证图片
+ALTER TABLE jsh_depot_head
+ADD COLUMN voucher_picture VARCHAR(255) DEFAULT '' COMMENT '凭证图片';
+
+-- 单据子表  新增实际出入库数量、出入库差异、出入库差异原因、出入库操作用户、出入库时间
+ALTER TABLE jsh_depot_item
+ADD COLUMN actual_quantity_in_storage DECIMAL(24,6) DEFAULT NULL COMMENT '实际出入库数量',
+ADD COLUMN warehousing_variance DECIMAL(24,6) DEFAULT NULL COMMENT '出入库差异',
+ADD COLUMN reason_of_difference VARCHAR(255) DEFAULT '' COMMENT '出入库差异原因',
+ADD COLUMN warehousing_user BIGINT DEFAULT NULL COMMENT '出入库操作用户',
+ADD COLUMN warehousing_time DATE DEFAULT NULL COMMENT '出入库时间';
+

src/main/java/com/jsh/erp/datasource/entities/Material.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * 产品表（商品表）
+ * 产品表实体类（商品信息）
  */
 @Data
 public class Material {
@@ -20,9 +20,6 @@ public class Material {
     @ApiModelProperty("产品名称")
     private String name;
 
-//    @ApiModelProperty("制造商")
-//    private String mfrs;
-
     @ApiModelProperty("型号")
     private String model;
 
@@ -50,9 +47,6 @@ public class Material {
     @ApiModelProperty("计量单位Id")
     private Long unitId;
 
-//    @ApiModelProperty("保质期天数")
-//    private Integer expiryNum;
-
     @ApiModelProperty("基础重量(kg)")
     private BigDecimal weight;
 
@@ -74,9 +68,6 @@ public class Material {
     @ApiModelProperty("是否开启批号，0否，1是")
     private String enableBatchNumber;
 
-//    @ApiModelProperty("仓位货架")
-//    private String position;
-
     @ApiModelProperty("租户id")
     private Long tenantId;
 

src/main/java/com/jsh/erp/datasource/entities/MaterialExtend.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 产品价格扩展
+ * 产品价格扩展表实体类
  */
 @Data
 public class MaterialExtend {

src/main/resources/mapper_xml/MaterialExtendMapper.xml

@@ -1,6 +1,7 @@
 <?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.jsh.erp.datasource.mappers.MaterialExtendMapper">
+
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialExtend">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="material_id" jdbcType="BIGINT" property="materialId" />
@@ -26,6 +27,7 @@
     <result column="depot_id" jdbcType="BIGINT" property="depotId" />
     <result column="position" jdbcType="VARCHAR" property="position" />
   </resultMap>
+
   <sql id="Example_Where_Clause">
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">

src/main/resources/mapper_xml/MaterialMapper.xml

@@ -6,7 +6,6 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="category_id" jdbcType="BIGINT" property="categoryId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="mfrs" jdbcType="VARCHAR" property="mfrs" />
     <result column="model" jdbcType="VARCHAR" property="model" />
     <result column="standard" jdbcType="VARCHAR" property="standard" />
     <result column="brand" jdbcType="VARCHAR" property="brand" />
@@ -16,7 +15,6 @@
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="img_name" jdbcType="VARCHAR" property="imgName" />
     <result column="unit_id" jdbcType="BIGINT" property="unitId" />
-    <result column="expiry_num" jdbcType="INTEGER" property="expiryNum" />
     <result column="weight" jdbcType="DECIMAL" property="weight" />
     <result column="enabled" jdbcType="BIT" property="enabled" />
     <result column="other_field1" jdbcType="VARCHAR" property="otherField1" />
@@ -24,9 +22,10 @@
     <result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
     <result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
     <result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
-    <result column="position" jdbcType="VARCHAR" property="position" />
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
+    <result column="system_sku" jdbcType="VARCHAR" property="systemSku" />
+    <result column="moving_pin_reminder_cycle" jdbcType="VARCHAR" property="movingPinReminderCycle" />
   </resultMap>
 
   <sql id="Example_Where_Clause">