Commit e2a118622ba37a646f971b7da05907f857f6c214
1 parent
2108191c
修改库存变化报表
Showing
3 changed files
with
8 additions
and
11 deletions
src/main/java/com/huaheng/pc/inventory/report/service/InventoryChangesServiceImpl.java
| @@ -16,13 +16,10 @@ public class InventoryChangesServiceImpl extends ServiceImpl<InventoryChangesMap | @@ -16,13 +16,10 @@ public class InventoryChangesServiceImpl extends ServiceImpl<InventoryChangesMap | ||
| 16 | @Override | 16 | @Override |
| 17 | public List<InventoryChanges> select(String startTime, String endTime, String materialCode) { | 17 | public List<InventoryChanges> select(String startTime, String endTime, String materialCode) { |
| 18 | List<InventoryChanges> list = mapper.select(startTime, endTime, materialCode); | 18 | List<InventoryChanges> list = mapper.select(startTime, endTime, materialCode); |
| 19 | - if (materialCode == null) { | ||
| 20 | - for (InventoryChanges changes : list) { | ||
| 21 | - String code = "商品编码"; | ||
| 22 | - changes.setMaterialCode(code); | ||
| 23 | - } | ||
| 24 | - }else{ | ||
| 25 | - for (InventoryChanges changes : list) { | 19 | + for (InventoryChanges changes : list) { |
| 20 | + if (materialCode == null){ | ||
| 21 | + changes.setMaterialCode("商品编码"); | ||
| 22 | + }else { | ||
| 26 | changes.setMaterialCode(materialCode); | 23 | changes.setMaterialCode(materialCode); |
| 27 | } | 24 | } |
| 28 | } | 25 | } |
src/main/resources/templates/inventory/report/inventoryChanges.html
| @@ -11,9 +11,9 @@ | @@ -11,9 +11,9 @@ | ||
| 11 | <ul> | 11 | <ul> |
| 12 | <li class="time" style="height: 30px"> | 12 | <li class="time" style="height: 30px"> |
| 13 | <label>创建时间： </label> | 13 | <label>创建时间： </label> |
| 14 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/> | 14 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime" readonly/> |
| 15 | <span>-</span> | 15 | <span>-</span> |
| 16 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/> | 16 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" readonly/> |
| 17 | </li> | 17 | </li> |
| 18 | <li> | 18 | <li> |
| 19 | 物料编码：<input type="text" name="code" class="code"/> | 19 | 物料编码：<input type="text" name="code" class="code"/> |
src/main/resources/templates/inventory/report/taskStatistics.html
| @@ -11,9 +11,9 @@ | @@ -11,9 +11,9 @@ | ||
| 11 | <ul> | 11 | <ul> |
| 12 | <li class="time" style="height: 30px"> | 12 | <li class="time" style="height: 30px"> |
| 13 | <label>创建时间： </label> | 13 | <label>创建时间： </label> |
| 14 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/> | 14 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime" readonly/> |
| 15 | <span>-</span> | 15 | <span>-</span> |
| 16 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/> | 16 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" readonly/> |
| 17 | </li> | 17 | </li> |
| 18 | <li> | 18 | <li> |
| 19 | 任务类型：<select class="seType" name="type" th:with="type=${@dict.getType('taskType')}"> | 19 | 任务类型：<select class="seType" name="type" th:with="type=${@dict.getType('taskType')}"> |