库位监控新增导出

2025-02-25 16:51:29 +08:00 · 2025-02-25 16:51:29 +08:00 · eb552f8d7f
commit eb552f8d7f
parent 5088c23b30
7 changed files with 133 additions and 115 deletions
--- a/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsReportController.java
+++ b/wms-admin/src/main/java/com/ruoyi/web/controller/business/EbsReportController.java
@ -86,6 +86,7 @@ public class EbsReportController extends BaseController {
                // 更新账户别名发放结果
                wmsOthersProcRes.setStatus("-1");
                wmsOthersProcRes.setResult(resultGetOthersInf);
+//                wmsOthersProcRes.setUpdateTime(new Date());
                tEbsRecordService.updateTEbsRecord(wmsOthersProcRes);
            }
        }
@ -110,11 +111,13 @@ public class EbsReportController extends BaseController {
                // 更新子库存转移
                WmsSubInvProcRes.setStatus("1");
                WmsSubInvProcRes.setResult(resultGetSubinvInf);
+//                WmsSubInvProcRes.setUpdateTime(new Date());
                tEbsRecordService.updateTEbsRecord(WmsSubInvProcRes);
            } else if (dataGetSubinvInf.size() > 0 && dataGetSubinvInf.get(0).getString("processStatus").equals("ERROR")) {
                // 更新子库存转移
                WmsSubInvProcRes.setStatus("-1");
                WmsSubInvProcRes.setResult(resultGetSubinvInf);
+//                WmsSubInvProcRes.setUpdateTime(new Date());
                tEbsRecordService.updateTEbsRecord(WmsSubInvProcRes);
            }
        }
--- a/wms-admin/src/main/java/com/ruoyi/web/controller/business/LocationController.java
+++ b/wms-admin/src/main/java/com/ruoyi/web/controller/business/LocationController.java
@ -10,6 +10,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.controller.demo.domain.UserOperateModel;
+import org.apache.commons.collections.bag.TransformedBag;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@ -19,6 +22,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.ArrayList;
+import java.util.List;
+
@Controller
@RequestMapping("/business/locationMonitor")
 public class LocationController extends BaseController {
@ -85,4 +91,17 @@ public class LocationController extends BaseController {
        }
        return success("1");
    }
+
+    /**
+     * 导出
+     */
+    @PostMapping("/export")
+    @ResponseBody
+    @RequiresPermissions("business:locationMonitor:export")
+    public AjaxResult export()
+    {
+        List<TBaseStorageAreaLocation> list = locationService.selectTBaseStorageAreaLocationList(new TBaseStorageAreaLocation());
+        ExcelUtil<TBaseStorageAreaLocation> util = new ExcelUtil<TBaseStorageAreaLocation>(TBaseStorageAreaLocation.class);
+        return util.exportExcel(list, "库位监控数据");
+    }
 }
--- a/wms-admin/src/main/resources/templates/business/locationMonitor/locationMonitor.html
+++ b/wms-admin/src/main/resources/templates/business/locationMonitor/locationMonitor.html
@ -7,41 +7,35 @@
 <body class="gray-bg">
 <div class="container-div">
  <div class="row" style="height: auto !important;">
-    <div class="col-sm-12 pr0 pl0 shadow">
-      <div class="ibox float-e-margins ">
-        <div class="ibox-title">
-          <div class="col-sm-8  pl0 pr0">
-            <h8>库位列表</h8>
-          </div>
+        <div class="col-sm-12 search-collapse">
+          <form id="formId">
+            <div class="select-list">
+              <ul>
+                <li>
+                  <label>库位编号：</label>
+                  <input type="text" name="locationId"/>
+                </li>
+                <li>
+                  <a class="btn btn-primary btn-rounded btn-sm"
+                     onclick="$.table.search('formId')"><i
+                          class="fa fa-search"></i>&nbsp;搜索</a>
+                  <a class="btn btn-warning btn-rounded btn-sm"
+                     onclick="$.form.reset('formId')"><i
+                          class="fa fa-refresh"></i>&nbsp;重置</a>
+                </li>
+              </ul>
+            </div>
+          </form>
        </div>
-        <div class="ibox-content ibox-content-1" style="margin: 0; height: 350px">
-          <div class="btn-group-sm" id="toolbar" role="group">
-            <form id="formId">
-              <div class="select-list">
-                <ul>
-                  <li>
-                    <label>库位编号：</label>
-                    <input type="text" name="locationId"/>
-                  </li>
-                  <li>
-                    <a class="btn btn-primary btn-rounded btn-sm"
-                       onclick="$.table.search('formId')"><i
-                            class="fa fa-search"></i>&nbsp;搜索</a>
-                    <a class="btn btn-warning btn-rounded btn-sm"
-                       onclick="$.form.reset('formId')"><i
-                            class="fa fa-refresh"></i>&nbsp;重置</a>
-                  </li>
-                </ul>
-              </div>
-            </form>
-          </div>
-          <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table" data-resizable="true"></table>
-          </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+          <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="business:locationMonitor:export">
+            <i class="fa fa-download"></i> 导出
+          </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+          <table id="bootstrap-table" data-resizable="true"></table>
        </div>
      </div>
-    </div>
-  </div>
 </div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
@ -53,6 +47,7 @@
  $(function () {
    var options = {
      url: prefix + "/list",
+      exportUrl: prefix + "/export",
      modalName: "库位列表",
      showSearch: false,
      showToggle: false,
@ -184,4 +179,4 @@
    margin-right: 0px;
    padding-top: 5px;
  }
-</style>
+</style>
--- a/wms-business/src/main/java/com/ruoyi/business/domain/TBaseStorageAreaLocation.java
+++ b/wms-business/src/main/java/com/ruoyi/business/domain/TBaseStorageAreaLocation.java
@ -14,7 +14,7 @@ import java.util.Date;

 /**
 * 库位资料对象 t_base_storage_area_location
- * 
+ *
 * @author wms
 * @date 2022-12-24
 */
@ -25,10 +25,25 @@ public class TBaseStorageAreaLocation extends BaseEntity

    /** 库位编号 */
    @TableId(value = "LOCATION_ID")
+    @Excel(name = "库位号")
    private String locationId;
+    /** ABC分类 */
+    @Excel(name = "巷道")
+    @TableField("ABC_ID")
+    private String abcId;
+
+    /** 有锁 0：否 1：是 */
+    @Excel(name = "是否锁定",dictType="is_lock",type = Excel.Type.EXPORT)
+    @TableField("ISLOCK")
+    private String islock;
+
+    /** 状态  0：正常 1：停用 */
+    @Excel(name = "是否占用",dictType="is_status",type = Excel.Type.EXPORT)
+    @TableField("STATUS")
+    private String status;

    /** 助记码 */
-    @Excel(name = "助记码")
+//    @Excel(name = "助记码")
    @TableField("PY_NAME")
    private String pyName;

@ -36,138 +51,128 @@ public class TBaseStorageAreaLocation extends BaseEntity
    @TableField(value = "STORAGE_ID")
    private String storageId;

-    /** 有锁 0：否 1：是 */
-    @Excel(name = "有锁 0：否 1：是")
-    @TableField("ISLOCK")
-    private String islock;
+

    /** 长 */
-    @Excel(name = "长")
+//    @Excel(name = "长")
    @TableField("LOCATION_LONG")
    private BigDecimal locationLong;

    /** 宽 */
-    @Excel(name = "宽")
+//    @Excel(name = "宽")
    @TableField("LOCATION_WIDTH")
    private BigDecimal locationWidth;

    /** 高 */
-    @Excel(name = "高")
+//    @Excel(name = "高")
    @TableField("LOCATION_HEIGHT")
    private String locationHeight;

    /** 容积 */
-    @Excel(name = "容积")
+//    @Excel(name = "容积")
    @TableField("VOLUME")
    private BigDecimal volume;

    /** 已占用容积 */
-    @Excel(name = "已占用容积")
+//    @Excel(name = "已占用容积")
    @TableField("HASVOLUME")
    private BigDecimal hasvolume;

    /** 承载重量 */
-    @Excel(name = "承载重量")
+//    @Excel(name = "承载重量")
    @TableField("BEARWEIGHT")
    private BigDecimal bearweight;

-    /** ABC分类 */
-    @Excel(name = "ABC分类")
-    @TableField("ABC_ID")
-    private String abcId;

    /** 排序 */
-    @Excel(name = "排序")
+//    @Excel(name = "排序")
    @TableField("SORT")
    private BigDecimal sort;

-    /** 状态  0：正常 1：停用 */
-    @Excel(name = "状态  0：正常 1：停用")
-    @TableField("STATUS")
-    private String status;
+

    /** 版本号 */
-    @Excel(name = "版本号")
+//    @Excel(name = "版本号")
    @TableField("VERSION")
    private String version;

    /** 操作人 */
-    @Excel(name = "操作人")
+//    @Excel(name = "操作人")
    @TableField("OPERATORID")
    private String operatorid;

    /** 操作时间 */
    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
    @TableField("OPERATEDATE")
    private Date operatedate;

    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    @TableField("ROW1")
    private String row1;

    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    @TableField("CLN")
    private String cln;

    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    @TableField("LAYER1")
    private String layer1;

-    public void setLocationId(String locationId) 
+    public void setLocationId(String locationId)
    {
        this.locationId = locationId;
    }

-    public String getLocationId() 
+    public String getLocationId()
    {
        return locationId;
    }
-    public void setPyName(String pyName) 
+    public void setPyName(String pyName)
    {
        this.pyName = pyName;
    }

-    public String getPyName() 
+    public String getPyName()
    {
        return pyName;
    }
-    public void setStorageId(String storageId) 
+    public void setStorageId(String storageId)
    {
        this.storageId = storageId;
    }

-    public String getStorageId() 
+    public String getStorageId()
    {
        return storageId;
    }
-    public void setIslock(String islock) 
+    public void setIslock(String islock)
    {
        this.islock = islock;
    }

-    public String getIslock() 
+    public String getIslock()
    {
        return islock;
    }
-    public void setLocationLong(BigDecimal locationLong) 
+    public void setLocationLong(BigDecimal locationLong)
    {
        this.locationLong = locationLong;
    }

-    public BigDecimal getLocationLong() 
+    public BigDecimal getLocationLong()
    {
        return locationLong;
    }
-    public void setLocationWidth(BigDecimal locationWidth) 
+    public void setLocationWidth(BigDecimal locationWidth)
    {
        this.locationWidth = locationWidth;
    }

-    public BigDecimal getLocationWidth() 
+    public BigDecimal getLocationWidth()
    {
        return locationWidth;
    }
@ -180,111 +185,111 @@ public class TBaseStorageAreaLocation extends BaseEntity
    {
        return locationHeight;
    }
-    public void setVolume(BigDecimal volume) 
+    public void setVolume(BigDecimal volume)
    {
        this.volume = volume;
    }

-    public BigDecimal getVolume() 
+    public BigDecimal getVolume()
    {
        return volume;
    }
-    public void setHasvolume(BigDecimal hasvolume) 
+    public void setHasvolume(BigDecimal hasvolume)
    {
        this.hasvolume = hasvolume;
    }

-    public BigDecimal getHasvolume() 
+    public BigDecimal getHasvolume()
    {
        return hasvolume;
    }
-    public void setBearweight(BigDecimal bearweight) 
+    public void setBearweight(BigDecimal bearweight)
    {
        this.bearweight = bearweight;
    }

-    public BigDecimal getBearweight() 
+    public BigDecimal getBearweight()
    {
        return bearweight;
    }
-    public void setAbcId(String abcId) 
+    public void setAbcId(String abcId)
    {
        this.abcId = abcId;
    }

-    public String getAbcId() 
+    public String getAbcId()
    {
        return abcId;
    }
-    public void setSort(BigDecimal sort) 
+    public void setSort(BigDecimal sort)
    {
        this.sort = sort;
    }

-    public BigDecimal getSort() 
+    public BigDecimal getSort()
    {
        return sort;
    }
-    public void setStatus(String status) 
+    public void setStatus(String status)
    {
        this.status = status;
    }

-    public String getStatus() 
+    public String getStatus()
    {
        return status;
    }
-    public void setVersion(String version) 
+    public void setVersion(String version)
    {
        this.version = version;
    }

-    public String getVersion() 
+    public String getVersion()
    {
        return version;
    }
-    public void setOperatorid(String operatorid) 
+    public void setOperatorid(String operatorid)
    {
        this.operatorid = operatorid;
    }

-    public String getOperatorid() 
+    public String getOperatorid()
    {
        return operatorid;
    }
-    public void setOperatedate(Date operatedate) 
+    public void setOperatedate(Date operatedate)
    {
        this.operatedate = operatedate;
    }

-    public Date getOperatedate() 
+    public Date getOperatedate()
    {
        return operatedate;
    }
-    public void setRow1(String row1) 
+    public void setRow1(String row1)
    {
        this.row1 = row1;
    }

-    public String getRow1() 
+    public String getRow1()
    {
        return row1;
    }
-    public void setCln(String cln) 
+    public void setCln(String cln)
    {
        this.cln = cln;
    }

-    public String getCln() 
+    public String getCln()
    {
        return cln;
    }
-    public void setLayer1(String layer1) 
+    public void setLayer1(String layer1)
    {
        this.layer1 = layer1;
    }

-    public String getLayer1() 
+    public String getLayer1()
    {
        return layer1;
    }
--- a/wms-business/src/main/java/com/ruoyi/business/domain/TEbsRecord.java
+++ b/wms-business/src/main/java/com/ruoyi/business/domain/TEbsRecord.java
@ -15,7 +15,7 @@ import java.util.Date;

 /**
 * 【请填写功能名称】对象 t_ebs_record
- * 
+ *
 * @author wms
 * @date 2022-11-15
 */
@ -116,12 +116,12 @@ public class TEbsRecord extends BaseEntity
    {
        return recordId;
    }
-    public void setMethodName(String methodName) 
+    public void setMethodName(String methodName)
    {
        this.methodName = methodName;
    }

-    public String getMethodName() 
+    public String getMethodName()
    {
        return methodName;
    }
@ -134,48 +134,48 @@ public class TEbsRecord extends BaseEntity
    {
        return apiId;
    }
-    public void setApiUrl(String apiUrl) 
+    public void setApiUrl(String apiUrl)
    {
        this.apiUrl = apiUrl;
    }

-    public String getApiUrl() 
+    public String getApiUrl()
    {
        return apiUrl;
    }
-    public void setApiParam(String apiParam) 
+    public void setApiParam(String apiParam)
    {
        this.apiParam = apiParam;
    }

-    public String getApiParam() 
+    public String getApiParam()
    {
        return apiParam;
    }
-    public void setResult(String result) 
+    public void setResult(String result)
    {
        this.result = result;
    }

-    public String getResult() 
+    public String getResult()
    {
        return result;
    }
-    public void setStatus(String status) 
+    public void setStatus(String status)
    {
        this.status = status;
    }

-    public String getStatus() 
+    public String getStatus()
    {
        return status;
    }
-    public void setDescription(String description) 
+    public void setDescription(String description)
    {
        this.description = description;
    }

-    public String getDescription() 
+    public String getDescription()
    {
        return description;
    }
--- a/wms-business/src/main/resources/mapper/TEbsRecordMapper.xml
+++ b/wms-business/src/main/resources/mapper/TEbsRecordMapper.xml
@ -18,12 +18,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="goodsName"    column="goods_name"    />
        <result property="lotId"    column="lot_id"    />
        <result property="quantity"    column="quantity"    />
-        <result property="createTime" column="CREATE_TIME" />
-        <result property="updateTime" column="UPDATE_TIME" />
    </resultMap>

    <sql id="selectTEbsRecordVo">
-        select record_id, method_name, api_id, api_url, api_param, result, status, description, operate_time, goods_id, goods_name, lot_id, quantity,CREATE_TIME,UPDATE_TIME from t_ebs_record
+        select record_id, method_name, api_id, api_url, api_param, result, status, description, operate_time, goods_id, goods_name, lot_id, quantity from t_ebs_record
    </sql>

    <select id="selectTEbsRecordList" parameterType="TEbsRecord" resultMap="TEbsRecordResult">
@ -64,7 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="goodsName != null">goods_name,</if>
            <if test="lotId != null">lot_id,</if>
            <if test="quantity != null">quantity,</if>
-            <if test="createTime != null">CREATE_TIME,</if>
            operate_time,
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@ -79,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="goodsName != null">#{goodsName},</if>
            <if test="lotId != null">#{lotId},</if>
            <if test="quantity != null">#{quantity},</if>
-            <if test="createTime != null">#{createTime},</if>
            now()
         </trim>
    </insert>
@ -98,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="goodsName != null">goods_name = #{goodsName},</if>
            <if test="lotId != null">lot_id = #{lotId},</if>
            <if test="quantity != null">quantity = #{quantity},</if>
-            <if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
            operate_time = now(),
        </trim>
        where record_id = #{recordId}
--- a/wms-quartz/src/main/java/com/ruoyi/quartz/task/ExpiryCheckTask.java
+++ b/wms-quartz/src/main/java/com/ruoyi/quartz/task/ExpiryCheckTask.java
@ -334,6 +334,7 @@ public class ExpiryCheckTask {
                // 更新账户别名发放结果
                getEkpExpireItem.setStatus("1");
                getEkpExpireItem.setResult(resultGetEkpExpireItem);
+//                getEkpExpireItem.setUpdateTime(new Date());
                tEbsRecordService.updateTEbsRecord(getEkpExpireItem);
            }
        }