diff --git 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 index bda8068..4b01eae 100644 --- 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); } } diff --git 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 index 5a3df80..f526264 100644 --- 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 list = locationService.selectTBaseStorageAreaLocationList(new TBaseStorageAreaLocation()); + ExcelUtil util = new ExcelUtil(TBaseStorageAreaLocation.class); + return util.exportExcel(list, "库位监控数据"); + } } diff --git a/wms-admin/src/main/resources/templates/business/locationMonitor/locationMonitor.html b/wms-admin/src/main/resources/templates/business/locationMonitor/locationMonitor.html index 1a2632b..6116027 100644 --- 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 @@
-
-
-
-
- 库位列表 -
+
+
+
+ +
+
-
-
-
-
- -
-
-
-
-
-
+ +
+
-
-