wms / wms_shanghaijiaoda · Commits

Commit fb7917581c228e15fe71d45be5f7e2580894625e

Authored by mahuandong
1 parent 11bd56ca

修改入库明细添加加载定位规则的错误

Inline Side-by-side
Showing 3 changed files with 8 additions and 8 deletions
src/main/resources/application-druid.properties
  View file @fb79175
... ... @@ -2,14 +2,14 @@
2 2 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
3 3 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
4 4 # \u4E3B\u5E93
5   -#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
  5 +spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
6 6 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
7   -spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
  7 +#spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
8 8  
9   -#spring.datasource.druid.master.username=softhuaheng
10   -#spring.datasource.druid.master.password=HHrobot123.
11   -spring.datasource.druid.master.username=root
12   -spring.datasource.druid.master.password=123456
  9 +spring.datasource.druid.master.username=softhuaheng
  10 +spring.datasource.druid.master.password=HHrobot123.
  11 +#spring.datasource.druid.master.username=root
  12 +#spring.datasource.druid.master.password=123456
13 13 # \u4ECE\u5E93
14 14 #spring.datasource.druid.slave.open = true
15 15 #spring.datasource.druid.slave.url=jdbc:mysql://172.16.29.45:3306/huaheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
... ...
src/main/resources/templates/config/excelTemplate/edit.html
  View file @fb79175
... ... @@ -31,7 +31,7 @@
31 31 <label class="col-sm-3 control-label">是否有效：</label>
32 32 <div class="col-sm-8">
33 33 <div class="onoffswitch">
34   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable" th:field="*{enable}" readonly="true">
  34 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable" >
35 35 <label class="onoffswitch-label" for="enable">
36 36 <span class="onoffswitch-inner"></span>
37 37 <span class="onoffswitch-switch"></span>
... ...
src/main/resources/templates/receipt/receiptDetail/add.html
  View file @fb79175
... ... @@ -84,7 +84,7 @@
84 84 <div class="form-group">
85 85 <label class="col-sm-3 control-label">定位规则：</label>
86 86 <div class="col-sm-8">
87   - <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail()}">
  87 + <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('入库')}">
88 88 <option value="">请选择</option>
89 89 <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
90 90 </select>
... ...