change - 物料信息、设备信息

aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java

@@ -44,7 +44,7 @@ public class BaseDeviceLedger extends BaseEntity {
      * 设备类型
      */
     @Excel(name = "设备类型")
-    private Long deviceType;
+    private String deviceType;
 
     /**
      * 设备位置
@@ -64,6 +64,19 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "使用部门")
     private String usedDepartment;
 
+    /** 成本中心 */
+    @Excel(name = "成本中心")
+    private String costCenter;
+
+    /** 生产厂商 */
+    @Excel(name = "生产厂商")
+    private String manufacturer;
+
+    /** 启用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date enableDate;
+
     /**
      * 所属工位
      */
@@ -102,6 +115,31 @@ public class BaseDeviceLedger extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+
+    public String getCostCenter() {
+        return costCenter;
+    }
+
+    public void setCostCenter(String costCenter) {
+        this.costCenter = costCenter;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public Date getEnableDate() {
+        return enableDate;
+    }
+
+    public void setEnableDate(Date enableDate) {
+        this.enableDate = enableDate;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }
@@ -134,11 +172,11 @@ public class BaseDeviceLedger extends BaseEntity {
         return deviceModel;
     }
 
-    public void setDeviceType(Long deviceType) {
+    public void setDeviceType(String deviceType) {
         this.deviceType = deviceType;
     }
 
-    public Long getDeviceType() {
+    public String getDeviceType() {
         return deviceType;
     }
 

aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java

@@ -92,6 +92,20 @@ public class BaseMaterialInfo extends BaseEntity
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    /**
+     * 增量日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "增量日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date incrementDate;
+
+    public Date getIncrementDate() {
+        return incrementDate;
+    }
+
+    public void setIncrementDate(Date incrementDate) {
+        this.incrementDate = incrementDate;
+    }
 
     public Long getObjId() {
         return objId;

aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml

@@ -14,6 +14,9 @@
             <result property="deviceStatus"    column="device_status"    />
             <result property="usedDepartment"    column="used_department"    />
             <result property="productLineCode"    column="product_line_code"    />
+            <result property="costCenter"    column="cost_center"    />
+            <result property="manufacturer"    column="manufacturer"    />
+            <result property="enableDate"    column="enable_date"    />
             <result property="isFlag"    column="is_flag"    />
             <result property="createdBy"    column="created_by"    />
             <result property="createdTime"    column="created_time"    />
@@ -22,7 +25,7 @@
     </resultMap>
 
     <sql id="selectBaseDeviceLedgerVo">
-        select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger
+        select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, cost_center, manufacturer, enable_date,product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger
     </sql>
 
     <select id="selectBaseDeviceLedgerList" parameterType="BaseDeviceLedger" resultMap="BaseDeviceLedgerResult">
@@ -64,6 +67,9 @@
                 <if test="deviceStatus != null">device_status,</if>
                 <if test="usedDepartment != null">used_department,</if>
                 <if test="productLineCode != null">product_line_code,</if>
+                <if test="costCenter != null">cost_center,</if>
+                <if test="manufacturer != null">manufacturer,</if>
+                <if test="enableDate != null">enable_date,</if>
                 <if test="isFlag != null">is_flag,</if>
                 <if test="createdBy != null">created_by,</if>
                 <if test="createdTime != null">created_time,</if>
@@ -80,6 +86,9 @@
                 <if test="deviceStatus != null">#{deviceStatus},</if>
                 <if test="usedDepartment != null">#{usedDepartment},</if>
                 <if test="productLineCode != null">#{productLineCode},</if>
+                <if test="costCenter != null">cost_center,</if>
+                <if test="manufacturer != null">manufacturer,</if>
+                <if test="enableDate != null">enable_date,</if>
                 <if test="isFlag != null">#{isFlag},</if>
                 <if test="createdBy != null">#{createdBy},</if>
                 <if test="createdTime != null">#{createdTime},</if>
@@ -98,6 +107,9 @@
                     <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
                     <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
                     <if test="usedDepartment != null">used_department = #{usedDepartment},</if>
+                    <if test="costCenter != null">#{costCenter},</if>
+                    <if test="manufacturer != null">#{manufacturer},</if>
+                    <if test="enableDate != null">#{enableDate},</if>
                     <if test="productLineCode != null">product_line_code = #{productLineCode},</if>
                     <if test="isFlag != null">is_flag = #{isFlag},</if>
                     <if test="createdBy != null">created_by = #{createdBy},</if>

aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml

@@ -21,6 +21,7 @@
         <result property="createdTime"    column="created_time"    />
         <result property="updatedBy"    column="updated_by"    />
         <result property="updatedTime"    column="updated_time"    />
+        <result property="incrementDate"    column="increment_date"    />
     </resultMap>
 
     <sql id="selectBaseMaterialInfoVo">
@@ -37,6 +38,7 @@
                bf.factory_name plantName,
                ml.productline_code,
                bpl.PRODUCT_LINE_NAME productLineName,
+               ml.increment_date,
                ml.is_flag,
                ml.created_by,
                ml.created_time,
@@ -90,6 +92,7 @@
             <if test="materialSpecifications != null">material_specifications,</if>
             <if test="plantCode != null">plant_code,</if>
             <if test="productLineCode != null">productline_code,</if>
+            <if test="incrementDate != null">increment_date,</if>
             <if test="isFlag != null">is_flag,</if>
             <if test="createdBy != null">created_by,</if>
             <if test="createdTime != null">created_time,</if>
@@ -108,6 +111,7 @@
             <if test="materialSpecifications != null">#{materialSpecifications},</if>
             <if test="plantCode != null">#{plantCode},</if>
             <if test="productLineCode != null">#{productLineCode},</if>
+            <if test="incrementDate != null">#{incrementDate},</if>
             <if test="isFlag != null">#{isFlag},</if>
             <if test="createdBy != null">#{createdBy},</if>
             <if test="createdTime != null">#{createdTime},</if>
@@ -129,6 +133,7 @@
             <if test="materialSpecifications != null">material_specifications = #{materialSpecifications},</if>
             <if test="plantCode != null">plant_code = #{plantCode},</if>
             <if test="productLineCode != null">productline_code = #{productLineCode},</if>
+            <if test="incrementDate != null">increment_date = #{incrementDate},</if>
             <if test="isFlag != null">is_flag = #{isFlag},</if>
             <if test="createdBy != null">created_by = #{createdBy},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>