Browse Source

修复物料类型处理时因oldid与id之间的问题

lwx_dev
erdanergou 3 years ago
parent
commit
12b1be7dbb
  1. 4
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 1
      src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java
  3. 4
      src/main/resources/templates/pages/application/application-in_back.html

4
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -568,11 +568,13 @@ public class PageController {
Depository depositoryRecordById = new Depository(); Depository depositoryRecordById = new Depository();
if (mid != null) { if (mid != null) {
materialById = materialService.findMaterialById(mid); materialById = materialService.findMaterialById(mid);
} }
if (depositoryId != null) { if (depositoryId != null) {
depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId); depositoryRecordById = depositoryService.findDepositoryRecordById(depositoryId);
} }
if(materialById.getShelfLife() == null){
mv.addObject("display","none");
}
mv.addObject("materialById", materialById); mv.addObject("materialById", materialById);
mv.addObject("depository", depositoryRecordById); mv.addObject("depository", depositoryRecordById);
mv.setViewName("pages/application/application-in_back"); mv.setViewName("pages/application/application-in_back");

1
src/main/java/com/dreamchaser/depository_manage/scheduled/SaticScheduleTask.java

@ -20,7 +20,6 @@ public class SaticScheduleTask {
// 每天凌晨0点执行一次 // 每天凌晨0点执行一次
@Scheduled(cron = "0 0 0 * * ?") @Scheduled(cron = "0 0 0 * * ?")
private void getTransData(){ private void getTransData(){
System.out.println("定时任务执行了");
materialService.InitTreeMenus_Test(); materialService.InitTreeMenus_Test();
} }

4
src/main/resources/templates/pages/application/application-in_back.html

@ -63,11 +63,11 @@
class="layui-input" lay-verify="required"> class="layui-input" lay-verify="required">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item" th:style="'display:'+${display}">
<label class="layui-form-label">生产日期:</label> <label class="layui-form-label">生产日期:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)" <input type="text" name="producedDate" id="producedDate" placeholder="请填写生产日期" onclick="selectDate(this)"
autocomplete="off" class="layui-input" lay-verify="required"> autocomplete="off" class="layui-input" >
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">

Loading…
Cancel
Save