物资柜和物资新增部分属性字段

ktg-admin/src/main/resources/application.yml

@@ -3,7 +3,7 @@ ktg-mes:
   # 名称
   name: ktg
   # 版本
-  version: 3.8.2
+  version: mars-1.0.2
   # 版权年份
   copyrightYear: 2022
   # 实例演示开关

ktg-admin/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
-Application Version: ${ktg.version}
+Application Version: ${ktg-mes.version}
 Spring Boot Version: ${spring-boot.version}
                                           _        _ _
                                           | |      (_|_)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsCabinetController.java

@@ -1,6 +1,5 @@
 package com.ktg.iscs.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -43,7 +42,7 @@ public class IsMaterialsCabinetController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isMaterialsCabinet", description = "实体参数")
     })
-    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
     @GetMapping("/getIsMaterialsCabinetPage")
     public CommonResult<Page<IsMaterialsCabinetVO>> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet)
     {
@@ -70,7 +69,7 @@ public class IsMaterialsCabinetController extends BaseController
      */
     @ApiOperation("获取物资柜详细信息")
     @Parameter(name = "cabinetId", description = "cabinetId")
-    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
     @GetMapping(value = "/selectIsMaterialsCabinetById")
     public CommonResult<IsMaterialsCabinet> selectIsMaterialsCabinetById(Long cabinetId)
     {
@@ -81,7 +80,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 新增物资柜
      */
     @ApiOperation("新增物资柜")
-    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:add')")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:add')")
     @Log(title = "物资柜", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsCabinet")
     public CommonResult<Boolean> insertIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "新增数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
@@ -93,7 +92,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 修改物资柜
      */
     @ApiOperation("修改物资柜")
-    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:edit')")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:edit')")
     @Log(title = "物资柜", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsCabinet")
     public CommonResult<Boolean> updateIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "修改数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
@@ -105,7 +104,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 删除物资柜
      */
     @ApiOperation("删除物资柜")
-    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:remove')")
+    @PreAuthorize("@ss.hasPermi('iscs:cabinet:remove')")
     @Log(title = "物资柜", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsCabinetByCabinetIds")
     public CommonResult<Boolean> deleteIsMaterialsCabinetByCabinetIds(String cabinetIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsController.java

@@ -47,7 +47,7 @@ public class IsMaterialsController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:list')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:list')")
     @GetMapping("/getIsMaterialsPage")
     public CommonResult<Page<MaterialsPageVO>> getIsMaterialsPage(Page<IsMaterials> page, MaterialsPageDTO dto)
     {
@@ -60,7 +60,7 @@ public class IsMaterialsController extends BaseController
      */
     @ApiOperation("导出物资列表")
     @Parameter(name = "isMaterials", description = "实体参数")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:export')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:export')")
     @Log(title = "物资", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterials")
     public void exportIsMaterials(HttpServletResponse response, IsMaterials isMaterials)
@@ -75,7 +75,7 @@ public class IsMaterialsController extends BaseController
      */
     @ApiOperation("获取物资详细信息")
     @Parameter(name = "materialsId", description = "materialsId")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:query')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:query')")
     @GetMapping(value = "/selectIsMaterialsById")
     public CommonResult<IsMaterials> selectIsMaterialsById(Long materialsId)
     {
@@ -86,7 +86,7 @@ public class IsMaterialsController extends BaseController
      * 新增物资
      */
     @ApiOperation("新增物资")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:add')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:add')")
     @Log(title = "物资", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterials")
     public CommonResult<Boolean> insertIsMaterials(@RequestBody @Parameter(name = "isMaterials", description = "新增数据类,放到body") IsMaterials isMaterials)
@@ -98,7 +98,7 @@ public class IsMaterialsController extends BaseController
      * 修改物资
      */
     @ApiOperation("修改物资")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:edit')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:edit')")
     @Log(title = "物资", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterials")
     public CommonResult<Boolean> updateIsMaterials(@RequestBody @Parameter(name = "isMaterials", description = "修改数据类,放到body") IsMaterials isMaterials)
@@ -107,7 +107,7 @@ public class IsMaterialsController extends BaseController
     }
 
     @ApiOperation("借出/归还物资")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:loan')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:loan')")
     @Log(title = "借出/归还物资", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialById")
     public CommonResult<Boolean> updateIsMaterialById(@RequestBody @Parameter(name = "isMaterials", description = "修改数据类,放到body") LoanMaterialDTO dto)
@@ -119,7 +119,7 @@ public class IsMaterialsController extends BaseController
      * 删除物资
      */
     @ApiOperation("删除物资")
-    // @PreAuthorize("@ss.hasPermi('iscs:materials:remove')")
+    @PreAuthorize("@ss.hasPermi('iscs:materials:remove')")
     @Log(title = "物资", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsByMaterialsIds")
     public CommonResult<Boolean> deleteIsMaterialsByMaterialsIds(String materialsIds)

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterials.java

@@ -75,4 +75,13 @@ public class IsMaterials extends BaseBean
     @Excel(name = "物资RFID")
     private String materialsRfid;
 
+    @ApiModelProperty(value = "供应商")
+    @Excel(name = "供应商")
+    private String supplier;
+
+    @ApiModelProperty(value = "有效期")
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expirationDate;
+
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsCabinet.java

@@ -37,11 +37,22 @@ public class IsMaterialsCabinet extends BaseBean
     private Long hardwareId;
 
     @ApiModelProperty(value = "区域ID")
-    @Excel(name = "区域ID")
     private Long workareaId;
 
+    @ApiModelProperty(value = "所属岗位ID")
+    private Long workstationId;
+
+    @ApiModelProperty(value = "物资类型图标")
+    private String cabinetIcon;
+
+    @ApiModelProperty(value = "物资类型缩略图")
+    private String cabinetPicture;
+
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @ApiModelProperty(value = "状态")
+    private String status;
+
 
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMaterialsType.java

@@ -60,6 +60,12 @@ public class IsMaterialsType extends BaseBean
     @Excel(name = "剩余次数")
     private Long availableTimes;
 
+    @ApiModelProperty(value = "物资类型图标")
+    private String materialsTypeIcon;
+
+    @ApiModelProperty(value = "物资类型缩略图")
+    private String materialsTypePicture;
+
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/materials/MaterialsPageDTO.java

@@ -43,4 +43,14 @@ public class MaterialsPageDTO
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
+    @ApiModelProperty(value = "有效期-开始时间")
+    private String startExpirationDate;
+
+    @ApiModelProperty(value = "有效期-结束时间")
+    private String endExpirationDate;
+
+    @ApiModelProperty(value = "供应商")
+    @Excel(name = "供应商")
+    private String supplier;
+
 }

ktg-iscs/src/main/resources/mapper/IsMaterialsCabinetMapper.xml

@@ -16,10 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="status"    column="status"    />
+        <result property="workstationId"    column="workstation_id"    />
+        <result property="cabinetIcon"    column="cabinet_icon"    />
+        <result property="cabinetPicture"    column="cabinet_picture"    />
     </resultMap>
 
     <sql id="selectIsMaterialsCabinetVo">
-        select cabinet_id, cabinet_code, cabinet_name, hardware_id, workarea_id, remark, del_flag, create_by, create_time, update_time, update_by from is_materials_cabinet
+        select * from is_materials_cabinet
     </sql>
 
     <select id="selectIsMaterialsCabinetList" parameterType="IsMaterialsCabinet" resultMap="IsMaterialsCabinetResult">
@@ -50,6 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="workstationId != null">workstation_id,</if>
+            <if test="cabinetIcon != null and cabinetIcon != ''">cabinet_icon,</if>
+            <if test="cabinetPicture != null and cabinetPicture != ''">cabinet_picture,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cabinetCode != null and cabinetCode != ''">#{cabinetCode},</if>
@@ -62,6 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="workstationId != null">#{workstationId},</if>
+            <if test="cabinetIcon != null and cabinetIcon != ''">#{cabinetIcon},</if>
+            <if test="cabinetPicture != null and cabinetPicture != ''">#{cabinetPicture},</if>
          </trim>
     </insert>
 
@@ -78,6 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="workstationId != null">workstation_id = #{workstationId},</if>
+            <if test="cabinetIcon != null and cabinetIcon != ''">cabinet_icon = #{cabinetIcon},</if>
+            <if test="cabinetPicture != null and cabinetPicture != ''">cabinet_picture = #{cabinetPicture},</if>
         </trim>
         where cabinet_id = #{cabinetId}
     </update>
@@ -112,7 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ORDER BY
         c.cabinet_id DESC
-
     </select>
 
 </mapper>

ktg-iscs/src/main/resources/mapper/IsMaterialsMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="loanState"    column="loan_state"    />
         <result property="materialsRfid"    column="materials_rfid"    />
+        <result property="supplier"    column="supplier"    />
+        <result property="expirationDate"    column="expiration_date"    />
     </resultMap>
 
     <sql id="selectIsMaterialsVo">
@@ -72,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="loanState != null and loanState != ''">loan_state,</if>
             <if test="materialsRfid != null">materials_rfid,</if>
+            <if test="supplier != null and supplier != ''">supplier,</if>
+            <if test="expirationDate != null">expiration_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsCode != null and materialsCode != ''">#{materialsCode},</if>
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="loanState != null and loanState != ''">#{loanState},</if>
             <if test="materialsRfid != null">#{materialsRfid},</if>
+            <if test="supplier != null and supplier != ''">#{supplier},</if>
+            <if test="expirationDate != null">#{expirationDate},</if>
          </trim>
     </insert>
 
@@ -116,6 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="loanState != null and loanState != ''">loan_state = #{loanState},</if>
             <if test="materialsRfid != null">materials_rfid = #{materialsRfid},</if>
+            <if test="supplier != null and supplier != ''">supplier = #{supplier},</if>
+            <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
         </trim>
         where materials_id = #{materialsId}
     </update>
@@ -133,11 +141,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getIsMaterialsPage" resultType="com.ktg.iscs.domain.vo.materials.MaterialsPageVO">
         SELECT
-            m.*,
-            t.materials_type_name,
-            c.cabinet_name
+        m.*,
+        t.materials_type_name,
+        c.cabinet_name
         FROM
-            is_materials m
+        is_materials m
         LEFT JOIN is_materials_type t ON t.materials_type_id = m.materials_type_id
         LEFT JOIN is_materials_cabinet c ON c.cabinet_id = m.materials_cabinet_id
         <where>
@@ -162,6 +170,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dto.endTime != null and dto.endTime.trim != ''">
                 and m.create_time &lt;= #{dto.endTime}
             </if>
+            <if test="dto.startExpirationDate != null and dto.startExpirationDate.trim != ''">
+                and m.expiration_date &gt;= #{dto.startExpirationDate}
+            </if>
+            <if test="dto.endExpirationDate != null and dto.endExpirationDate.trim != ''">
+                and m.expiration_date &lt;= #{dto.endExpirationDate}
+            </if>
+            <if test="dto.supplier != null and dto.supplier.trim != ''">
+                and m.supplier like concat('%',#{dto.supplier},'%')
+            </if>
         </where>
         ORDER BY m.materials_id DESC
     </select>

ktg-iscs/src/main/resources/mapper/IsMaterialsTypeMapper.xml

@@ -22,13 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="status"    column="status"    />
+        <result property="materialsTypeIcon"    column="materials_type_icon"    />
+        <result property="materialsTypePicture"    column="materials_type_picture"    />
     </resultMap>
 
     <sql id="selectIsMaterialsTypeVo">
-        select materials_type_id, materials_type_code, materials_type_name, parent_id, ancestors, enable_flag,
-               service_life, available_life, service_times, available_times, remark, del_flag, create_by, create_time,
-               update_time, update_by, status
-        from is_materials_type
+        select * from is_materials_type
     </sql>
 
     <select id="selectIsMaterialsTypeList" parameterType="IsMaterialsType" resultMap="IsMaterialsTypeResult">
@@ -66,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="status != null and status != ''">status,</if>
+            <if test="materialsTypeIcon != null and materialsTypeIcon != ''">materials_type_icon,</if>
+            <if test="materialsTypePicture != null and materialsTypePicture != ''">materials_type_picture,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialsTypeCode != null and materialsTypeCode != ''">#{materialsTypeCode},</if>
@@ -84,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="status != null and status != ''">#{status},</if>
+            <if test="materialsTypeIcon != null and materialsTypeIcon != ''">#{materialsTypeIcon},</if>
+            <if test="materialsTypePicture != null and materialsTypePicture != ''">#{materialsTypePicture},</if>
          </trim>
     </insert>
 
@@ -106,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="status != null and status != ''">status = #{status},</if>
+            <if test="materialsTypeIcon != null and materialsTypeIcon != ''">materials_type_icon = #{materialsTypeIcon},</if>
+            <if test="materialsTypePicture != null and materialsTypePicture != ''">materials_type_picture = #{materialsTypePicture},</if>
         </trim>
         where materials_type_id = #{materialsTypeId}
     </update>