diff --git a/src/main/java/com/huaheng/pc/inventory/report/service/InventoryChangesServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/report/service/InventoryChangesServiceImpl.java index b3343f3..6dc7ad9 100644 --- a/src/main/java/com/huaheng/pc/inventory/report/service/InventoryChangesServiceImpl.java +++ b/src/main/java/com/huaheng/pc/inventory/report/service/InventoryChangesServiceImpl.java @@ -16,13 +16,10 @@ public class InventoryChangesServiceImpl extends ServiceImpl<InventoryChangesMap @Override public List<InventoryChanges> select(String startTime, String endTime, String materialCode) { List<InventoryChanges> list = mapper.select(startTime, endTime, materialCode); - if (materialCode == null) { - for (InventoryChanges changes : list) { - String code = "商品编码"; - changes.setMaterialCode(code); - } - }else{ - for (InventoryChanges changes : list) { + for (InventoryChanges changes : list) { + if (materialCode == null){ + changes.setMaterialCode("商品编码"); + }else { changes.setMaterialCode(materialCode); } } diff --git a/src/main/resources/templates/inventory/report/inventoryChanges.html b/src/main/resources/templates/inventory/report/inventoryChanges.html index 680d0a6..0a00b5b 100644 --- a/src/main/resources/templates/inventory/report/inventoryChanges.html +++ b/src/main/resources/templates/inventory/report/inventoryChanges.html @@ -11,9 +11,9 @@ <ul> <li class="time" style="height: 30px"> <label>创建时间: </label> - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/> + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime" readonly/> <span>-</span> - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/> + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" readonly/> </li> <li> 物料编码:<input type="text" name="code" class="code"/> diff --git a/src/main/resources/templates/inventory/report/taskStatistics.html b/src/main/resources/templates/inventory/report/taskStatistics.html index 8d15963..082cbe5 100644 --- a/src/main/resources/templates/inventory/report/taskStatistics.html +++ b/src/main/resources/templates/inventory/report/taskStatistics.html @@ -11,9 +11,9 @@ <ul> <li class="time" style="height: 30px"> <label>创建时间: </label> - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/> + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime" readonly/> <span>-</span> - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/> + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" readonly/> </li> <li> 任务类型:<select class="seType" name="type" th:with="type=${@dict.getType('taskType')}">