wms / WMS_LZZT · Commits

Commit dd642e29914e7fcb162481a844633812b9d88d7a

Authored by pengcheng
1 parent 3a45842f

盘点调整修改为盘点差异

Inline Side-by-side
Showing 4 changed files with 14 additions and 14 deletions
.idea/compiler.xml
  View file @dd642e2
... ... @@ -14,7 +14,7 @@
14 14 </component>
15 15 <component name="JavacSettings">
16 16 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
17   - <module name="WMSV1" options="-parameters" />
  17 + <module name="WMSV1" options="" />
18 18 </option>
19 19 </component>
20 20 </project>
21 21 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/cyclecountAdjust/service/CyclecountAdjustServiceImpl.java
  View file @dd642e2
... ... @@ -77,7 +77,7 @@ public class CyclecountAdjustServiceImpl implements ICycleconutAdjustService {
77 77  
78 78  
79 79  
80   - //生成调整单号
  80 + //生成差异调整单号
81 81 @Override
82 82 public String createCode() {
83 83 String code;
... ... @@ -88,11 +88,11 @@ public class CyclecountAdjustServiceImpl implements ICycleconutAdjustService {
88 88 if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now)))
89 89 {
90 90 Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
91   - code = "TZ" + df.format(now) + String.format("%05d", Count + 1);
  91 + code = "CY" + df.format(now) + String.format("%05d", Count + 1);
92 92 }
93 93 else
94 94 {
95   - code = "TZ" + df.format(now) + "00001";
  95 + code = "CY" + df.format(now) + "00001";
96 96 }
97 97 return code;
98 98 }
... ...
src/main/resources/templates/inventory/cyclecountAdjust/cyclecountAdjust.html
  View file @dd642e2
... ... @@ -15,7 +15,7 @@
15 15 <div class="row">
16 16 <div class="col-sm-12 select-info">
17 17 <ul id="myTab" class="nav nav-tabs">
18   - <li class="active"><a href="#tabHeader" data-toggle="tab">调整单主</a></li>
  18 + <li class="active"><a href="#tabHeader" data-toggle="tab">差异单主</a></li>
19 19 <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
20 20 </ul>
21 21 <div id="myTabContent" class="tab-content">
... ... @@ -25,13 +25,13 @@
25 25 <div class="select-list">
26 26 <ul>
27 27 <li>
28   - 调整单编号：<input type="text" name="code"/>
  28 + 差异单编号：<input type="text" name="code"/>
29 29 </li>
30 30 <li>
31 31 源盘点单号：<input type="text" name="sourceCode"/>
32 32 </li>
33 33 <li>
34   - 调整单状态：<select name="status"
  34 + 差异单状态：<select name="status"
35 35 th:with="lastStatus=${@dict.getType('adjustType')}">
36 36 <option value="">所有</option>
37 37 <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
... ... @@ -102,11 +102,11 @@
102 102 },
103 103 {
104 104 field : 'id',
105   - title : '调整单id'
  105 + title : '差异单id'
106 106 },
107 107 {
108 108 field : 'code',
109   - title : '调整单编码'
  109 + title : '差异单编码'
110 110 },
111 111 {
112 112 field : 'cyclecountHeadId',
... ... @@ -128,7 +128,7 @@
128 128 },
129 129 {
130 130 field: 'status',
131   - title: '调整单状态',
  131 + title: '差异单状态',
132 132 align: 'center',
133 133 formatter: function(value, row, index) {
134 134 return $.table.selectDictLabel(status2, value);
... ... @@ -219,7 +219,7 @@
219 219  
220 220 function cyclecountPrint(id) {
221 221 var url = prefix + "/report/" + id;
222   - $.modal.open("调整单打印" , url);
  222 + $.modal.open("差异单打印" , url);
223 223 }
224 224 </script>
225 225 </body>
... ...
src/main/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html
  View file @dd642e2
... ... @@ -10,7 +10,7 @@
10 10 <ul>
11 11 <li>
12 12 <form id="cycleHeader-form">
13   - 调整单ID：<input type="text" id="cyclecountAdjustId" name="cyclecountAdjustId" th:value="*{id}" readonly="readonly">
  13 + 差异单ID：<input type="text" id="cyclecountAdjustId" name="cyclecountAdjustId" th:value="*{id}" readonly="readonly">
14 14 </form>
15 15 </li>
16 16 <li>
... ... @@ -87,7 +87,7 @@
87 87 /* createUrl: prefix + "/add",
88 88 updateUrl: prefix + "/edit/{id}",
89 89 removeUrl: prefix + "/remove",*/
90   - modalName: "调整单明细",
  90 + modalName: "差异单明细",
91 91 sortName: "id",
92 92 sortOrder: "desc",
93 93 showRefresh:false,
... ... @@ -104,7 +104,7 @@
104 104 },
105 105 {
106 106 field: 'cyclecountAdjustCode',
107   - title: '调整单编码',
  107 + title: '差异单编码',
108 108 visible: false
109 109 },
110 110 {
... ...