diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java index aee426ec..8e7fbcf0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryInquiryController.java @@ -126,18 +126,18 @@ public class WarehouseInventoryInquiryController extends BaseController } /** - * 修改仓库库存历史 + * 修改仓库库存履历 */ - @GetMapping("/inventoryHistory/{materialNo}") - public String inventoryHistory(@PathVariable("materialNo") String materialNo, ModelMap mmap) + @GetMapping("/inventoryHistory/{inventoryInquiryId}") + public String inventoryHistory(@PathVariable("inventoryInquiryId") Long inventoryInquiryId, ModelMap mmap) { - WarehouseInventoryInquiry warehouseInventoryInquiry = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryByMaterialNo(materialNo); + WarehouseInventoryInquiry warehouseInventoryInquiry = warehouseInventoryInquiryService.selectWarehouseInventoryInquiryById(inventoryInquiryId); mmap.put("warehouseInventoryInquiry", warehouseInventoryInquiry); return prefix + "/inventoryHistory"; } /** - * 修改保存仓库库存历史 + * 修改保存仓库库存履历 */ @RequiresPermissions("warehouse:inventoryInquiry:inventoryHistory") @Log(title = "仓库库存查询", businessType = BusinessType.UPDATE) @@ -145,7 +145,7 @@ public class WarehouseInventoryInquiryController extends BaseController @ResponseBody public AjaxResult inventoryHistorySave(WarehouseInventoryInquiry warehouseInventoryInquiry) { - return toAjax(warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(warehouseInventoryInquiry)); + return toAjax(warehouseInventoryInquiryService.updateWarehouseInventoryHistory(warehouseInventoryInquiry)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java index f1da2998..e378b618 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseInventoryInquiryService.java @@ -108,4 +108,8 @@ public interface IWarehouseInventoryInquiryService { Integer calculateFixedAvailableStockNum(String materialNo); + /** + * 修改保存库存履历 + * */ + int updateWarehouseInventoryHistory(WarehouseInventoryInquiry warehouseInventoryInquiry); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java index a456a49e..d52f1add 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryInquiryServiceImpl.java @@ -295,4 +295,14 @@ public class WarehouseInventoryInquiryServiceImpl implements IWarehouseInventory //【可用库存数】-【共享可用库存数】 return null; } + + /** + * 修改保存库存履历 + * */ + @Override + public int updateWarehouseInventoryHistory(WarehouseInventoryInquiry warehouseInventoryInquiry) { + + + return 1; + } } diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html index ed2c0d7b..724ae82b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryHistory.html @@ -5,7 +5,7 @@
-
+
@@ -58,16 +58,19 @@ var prefix = ctx + "warehouse/inventoryInquiry"; var warehouseInventoryInquiry = [[${warehouseInventoryInquiry}]]; - var inventoryHistoricalType = [[${@dict.getType('inventory_historical_type')}]]; + var inventoryIncreaseDecrease = [[${@dict.getType('inventory_increase_decrease')}]]; + var inquiryBusinessType = [[${@dict.getType('inquiry_business_type')}]]; + var inquiryOrderType = [[${@dict.getType('inquiry_order_type')}]]; + var inquiryWarehouseType = [[${@dict.getType('inquiry_warehouse_type')}]] - $("#form-inventoryHistory-edit").validate({ + $("#form-inventoryHistory-inventoryHistory").validate({ focusCleanup: true }); function submitHandler() { if ($.validate.form()) { - $.operate.save(prefix + "/edit", $('#form-inventoryHistory-edit').serialize()); + $.operate.save(prefix + "/inventoryHistory", $('#form-inventoryHistory-inventoryHistory').serialize()); } } @@ -76,7 +79,7 @@ $(function() { var options = { modalName: "选择物料", - url: ctx + "warehouse/inventoryInquiry/getMaterialInventoryHistoricalList", + url: prefix + "/getMaterialInventoryHistoricalList", queryParams: queryParams, showSearch: false, showRefresh: false, @@ -88,25 +91,31 @@ {title: '库存查询详情id', field: 'inventoryInquiryDetailId', visible: false}, {title: '物料号', field: 'materialNo', visible: false}, {title: '时间', field: 'inventoryHistoricalTime',}, - {title: '类型', field: 'inventoryHistoricalType', + {title: '库存增减', field: 'inventoryIncreaseDecrease', formatter: function(value, row, index) { - return $.table.selectDictLabel(inventoryHistoricalType, value); + return $.table.selectDictLabel(inventoryIncreaseDecrease, value); } }, - {title: '库存增减', field: 'inventoryIncreaseDecrease', + {title: '单号', field: 'correlationCode'}, + {title: '出货设备ID', field: 'shippingDeviceId'}, + {title: '数量', field: 'increaseDecreaseNum'}, + {title: '业务类型', field: 'inquiryBusinessType', formatter: function(value, row, index) { - return $.table.selectDictLabel(inventoryIncreaseDecrease, value); + return $.table.selectDictLabel(inquiryBusinessType, value); } }, - {title: '数量', field: 'availableStockNum'}, - {title: '库存历史数量', field: 'inventoryHistoricalNum',visible: false}, - {title: '不含税采购总价', field: 'purchasePriceExcludingTax',}, - {title: '含税总价', field: 'purchasePriceIncludesTax',}, - {title: '采购单号', field: 'purchaseOrderCode',}, - {title: '供应商ID', field: 'supplierCode',}, - {title: '供应商名称', field: 'supplierName',}, - {title: '库存归属单号', field: 'inventoryAttributionCode',}, - {title: '库存使用单号', field: 'inventoryUseCode',}, + {title: '订单类型', field: 'inquiryOrderType', + formatter: function(value, row, index) { + return $.table.selectDictLabel(inquiryOrderType, value); + } + }, + {title: '出入库类型', field: 'inquiryWarehouseType', + formatter: function(value, row, index) { + return $.table.selectDictLabel(inquiryWarehouseType, value); + } + }, + + ] }; $.table.init(options); diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html index fe8e7101..be4cf4be 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryInquiry/inventoryInquiry.html @@ -34,10 +34,7 @@
@@ -49,8 +46,8 @@ \ No newline at end of file