wms / wms_wuhangelinmei · Commits

Commit dbba985e86af1c9e812e54f9acedf43b4c05725a

Authored by tongzhonghao
2 parents 13f979f3 8bb4b359

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 2 changed files with 157 additions and 163 deletions
src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
  View file @dbba985
@@ -159,7 +159,7 @@ public class ShipmentApiService { @@ -159,7 +159,7 @@ public class ShipmentApiService {
159 shipmentDetail.setAllCreditCode(customer.getAllCreditCode()); 159 shipmentDetail.setAllCreditCode(customer.getAllCreditCode());
160 } 160 }
161 shipmentDetail.setSaleArea(saleArea); 161 shipmentDetail.setSaleArea(saleArea);
162 - shipmentDetail.setFentity(shipmentDetail.getFentity()); 162 + shipmentDetail.setFentity(shipmentDetail.getReferId()+"");//体制码
163 shipmentDetail.setInventorySts(QuantityConstant.GOOD); 163 shipmentDetail.setInventorySts(QuantityConstant.GOOD);
164 shipmentDetail.setShipmentId(shipmentHeader.getId()); 164 shipmentDetail.setShipmentId(shipmentHeader.getId());
165 shipmentDetail.setShipQty(shipmentDetail.getUnitId1Qty()); 165 shipmentDetail.setShipQty(shipmentDetail.getUnitId1Qty());
src/main/resources/templates/shipment/shipmentDetail/edit.html
  View file @dbba985
@@ -130,12 +130,12 @@ @@ -130,12 +130,12 @@
130 130
131 131
132 132
133 - <div class="form-group" th:if="${isBattery}">  
134 - <label class="col-sm-3 control-label">梯次包编码：</label>  
135 - <div class="col-sm-8">  
136 - <input id="echelonPacketCode" name="echelonPacketCode" th:field="*{echelonPacketCode}" class="form-control" type="text">  
137 - </div>  
138 - </div> 133 +<!-- <div class="form-group" th:if="${isBattery}">-->
  134 +<!-- <label class="col-sm-3 control-label">梯次包编码：</label>-->
  135 +<!-- <div class="col-sm-8">-->
  136 +<!-- <input id="echelonPacketCode" name="echelonPacketCode" th:field="*{echelonPacketCode}" class="form-control" type="text">-->
  137 +<!-- </div>-->
  138 +<!-- </div>-->
139 <div class="form-group" th:if="${isBattery}"> 139 <div class="form-group" th:if="${isBattery}">
140 <label class="col-sm-3 control-label">梯次应用领域：</label> 140 <label class="col-sm-3 control-label">梯次应用领域：</label>
141 <div class="col-sm-8"> 141 <div class="col-sm-8">
@@ -154,24 +154,24 @@ @@ -154,24 +154,24 @@
154 </select> 154 </select>
155 </div> 155 </div>
156 </div> 156 </div>
157 - <div class="form-group" th:if="${isBattery}">  
158 - <label class="col-sm-3 control-label">其他内容：</label>  
159 - <div class="col-sm-8">  
160 - <input id="otherContent" name="otherContent" th:field="*{otherContent}" class="form-control" type="text">  
161 - </div>  
162 - </div>  
163 - <div class="form-group" th:if="${isBattery}">  
164 - <label class="col-sm-3 control-label">梯次包去向企业名称 ：</label>  
165 - <div class="col-sm-8">  
166 - <input id="echelonEnterpriseName" name="otherContent" th:field="*{echelonEnterpriseName}" class="form-control" type="text">  
167 - </div>  
168 - </div>  
169 - <div class="form-group" th:if="${isBattery}">  
170 - <label class="col-sm-3 control-label">梯次包去向企业信用代码：</label>  
171 - <div class="col-sm-8">  
172 - <input id="echelonEnterpriseCode" name="otherContent" th:field="*{echelonEnterpriseCode}" class="form-control" type="text">  
173 - </div>  
174 - </div> 157 +<!-- <div class="form-group" th:if="${isBattery}">-->
  158 +<!-- <label class="col-sm-3 control-label">其他内容：</label>-->
  159 +<!-- <div class="col-sm-8">-->
  160 +<!-- <input id="otherContent" name="otherContent" th:field="*{otherContent}" class="form-control" type="text">-->
  161 +<!-- </div>-->
  162 +<!-- </div>-->
  163 +<!-- <div class="form-group" th:if="${isBattery}">-->
  164 +<!-- <label class="col-sm-3 control-label">梯次包去向企业名称 ：</label>-->
  165 +<!-- <div class="col-sm-8">-->
  166 +<!-- <input id="echelonEnterpriseName" name="otherContent" th:field="*{echelonEnterpriseName}" class="form-control" type="text">-->
  167 +<!-- </div>-->
  168 +<!-- </div>-->
  169 +<!-- <div class="form-group" th:if="${isBattery}">-->
  170 +<!-- <label class="col-sm-3 control-label">梯次包去向企业信用代码：</label>-->
  171 +<!-- <div class="col-sm-8">-->
  172 +<!-- <input id="echelonEnterpriseCode" name="otherContent" th:field="*{echelonEnterpriseCode}" class="form-control" type="text">-->
  173 +<!-- </div>-->
  174 +<!-- </div>-->
175 <div class="form-group" th:if="${isBattery}"> 175 <div class="form-group" th:if="${isBattery}">
176 <label class="col-sm-3 control-label">构成方式：</label> 176 <label class="col-sm-3 control-label">构成方式：</label>
177 <div class="col-sm-8"> 177 <div class="col-sm-8">
@@ -181,30 +181,30 @@ @@ -181,30 +181,30 @@
181 </select> 181 </select>
182 </div> 182 </div>
183 </div> 183 </div>
184 - <div class="form-group" th:if="${isBattery}">  
185 - <label class="col-sm-3 control-label">去向个人姓名：</label>  
186 - <div class="col-sm-8">  
187 - <input id="customerName" name="customerName" th:field="*{customerName}" class="form-control" type="text">  
188 - </div>  
189 - </div>  
190 - <div class="form-group" th:if="${isBattery}">  
191 - <label class="col-sm-3 control-label">去向个人身份证：</label>  
192 - <div class="col-sm-8">  
193 - <input id="customerIDNumber" name="customerIDNumber" th:field="*{customerIDNumber}" class="form-control" type="text">  
194 - </div>  
195 - </div>  
196 - <div class="form-group" th:if="${isBattery}">  
197 - <label class="col-sm-3 control-label">梯次模块编码：</label>  
198 - <div class="col-sm-8">  
199 - <input id="echelonModuleCode" name="echelonModuleCode" th:field="*{echelonModuleCode}" class="form-control" type="text">  
200 - </div>  
201 - </div>  
202 - <div class="form-group" th:if="${isBattery}">  
203 - <label class="col-sm-3 control-label">梯次单体编码：</label>  
204 - <div class="col-sm-8">  
205 - <input id="echelonMonomerCode" name="echelonMonomerCode" th:field="*{echelonMonomerCode}" class="form-control" type="text">  
206 - </div>  
207 - </div> 184 +<!-- <div class="form-group" th:if="${isBattery}">-->
  185 +<!-- <label class="col-sm-3 control-label">去向个人姓名：</label>-->
  186 +<!-- <div class="col-sm-8">-->
  187 +<!-- <input id="customerName" name="customerName" th:field="*{customerName}" class="form-control" type="text">-->
  188 +<!-- </div>-->
  189 +<!-- </div>-->
  190 +<!-- <div class="form-group" th:if="${isBattery}">-->
  191 +<!-- <label class="col-sm-3 control-label">去向个人身份证：</label>-->
  192 +<!-- <div class="col-sm-8">-->
  193 +<!-- <input id="customerIDNumber" name="customerIDNumber" th:field="*{customerIDNumber}" class="form-control" type="text">-->
  194 +<!-- </div>-->
  195 +<!-- </div>-->
  196 +<!-- <div class="form-group" th:if="${isBattery}">-->
  197 +<!-- <label class="col-sm-3 control-label">梯次模块编码：</label>-->
  198 +<!-- <div class="col-sm-8">-->
  199 +<!-- <input id="echelonModuleCode" name="echelonModuleCode" th:field="*{echelonModuleCode}" class="form-control" type="text">-->
  200 +<!-- </div>-->
  201 +<!-- </div>-->
  202 +<!-- <div class="form-group" th:if="${isBattery}">-->
  203 +<!-- <label class="col-sm-3 control-label">梯次单体编码：</label>-->
  204 +<!-- <div class="col-sm-8">-->
  205 +<!-- <input id="echelonMonomerCode" name="echelonMonomerCode" th:field="*{echelonMonomerCode}" class="form-control" type="text">-->
  206 +<!-- </div>-->
  207 +<!-- </div>-->
208 <div class="form-group" th:if="${isBattery}"> 208 <div class="form-group" th:if="${isBattery}">
209 <label class="col-sm-3 control-label">电池产品类型：</label> 209 <label class="col-sm-3 control-label">电池产品类型：</label>
210 <div class="col-sm-8"> 210 <div class="col-sm-8">
@@ -218,132 +218,126 @@ @@ -218,132 +218,126 @@
218 </select> 218 </select>
219 </div> 219 </div>
220 </div> 220 </div>
221 - <div class="form-group" th:if="${isBattery}">  
222 - <label class="col-sm-3 control-label">电池编码：</label>  
223 - <div class="col-sm-8">  
224 - <input id="batteryCode" name="batteryCode" th:field="*{batteryCode}" class="form-control" type="text">  
225 - </div>  
226 - </div>  
227 - <div class="form-group" th:if="${isBattery}">  
228 - <label class="col-sm-3 control-label">国家编码：</label>  
229 - <div class="col-sm-8">  
230 - <input id="countryCode" name="countryCode" th:field="*{countryCode}" class="form-control" type="text">  
231 - </div>  
232 - </div>  
233 - <div class="form-group">  
234 - <label class="col-sm-3 control-label">出库时间：</label>  
235 - <div class="col-sm-8">  
236 - <input id="shipmentDate" name="shipmentDate" th:field="*{shipmentDate}" class="form-control" type="text">  
237 - </div>  
238 - </div>  
239 - <div class="form-group" th:if="${isBattery}">  
240 - <label class="col-sm-3 control-label">电池去向企业名称：</label>  
241 - <div class="col-sm-8">  
242 - <input id="enterpriseName" name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">  
243 - </div>  
244 - </div> 221 +<!-- <div class="form-group" th:if="${isBattery}">-->
  222 +<!-- <label class="col-sm-3 control-label">电池编码：</label>-->
  223 +<!-- <div class="col-sm-8">-->
  224 +<!-- <input id="batteryCode" name="batteryCode" th:field="*{batteryCode}" class="form-control" type="text">-->
  225 +<!-- </div>-->
  226 +<!-- </div>-->
  227 +<!-- <div class="form-group" th:if="${isBattery}">-->
  228 +<!-- <label class="col-sm-3 control-label">国家编码：</label>-->
  229 +<!-- <div class="col-sm-8">-->
  230 +<!-- <input id="countryCode" name="countryCode" th:field="*{countryCode}" class="form-control" type="text">-->
  231 +<!-- </div>-->
  232 +<!-- </div>-->
  233 +<!-- <div class="form-group">-->
  234 +<!-- <label class="col-sm-3 control-label">出库时间：</label>-->
  235 +<!-- <div class="col-sm-8">-->
  236 +<!-- <input id="shipmentDate" name="shipmentDate" th:field="*{shipmentDate}" class="form-control" type="text">-->
  237 +<!-- </div>-->
  238 +<!-- </div>-->
  239 +<!-- <div class="form-group" th:if="${isBattery}">-->
  240 +<!-- <label class="col-sm-3 control-label">电池去向企业名称：</label>-->
  241 +<!-- <div class="col-sm-8">-->
  242 +<!-- <input id="enterpriseName" name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text">-->
  243 +<!-- </div>-->
  244 +<!-- </div>-->
245 <!--<div class="form-group" th:if="${isBattery}"> 245 <!--<div class="form-group" th:if="${isBattery}">
246 <label class="col-sm-3 control-label">电池去向企业统一社会信用代码：</label> 246 <label class="col-sm-3 control-label">电池去向企业统一社会信用代码：</label>
247 <div class="col-sm-8"> 247 <div class="col-sm-8">
248 <input id="allCreditCode" name="allCreditCode" th:field="*{allCreditCode}" class="form-control" type="text"> 248 <input id="allCreditCode" name="allCreditCode" th:field="*{allCreditCode}" class="form-control" type="text">
249 </div> 249 </div>
250 </div>--> 250 </div>-->
251 - <div class="form-group">  
252 - <label class="col-sm-3 control-label">出库质量(kg)：</label>  
253 - <div class="col-sm-8">  
254 - <input id="shipQuality" name="shipQuality" th:field="*{shipQuality}" class="form-control" type="text">  
255 - </div>  
256 - </div>  
257 - <div class="form-group" th:if="${isBattery}">  
258 - <label class="col-sm-3 control-label">再生日期：</label>  
259 - <div class="col-sm-8">  
260 - <input id="regenerateDate" name="regenerateDate" th:field="*{regenerateDate}" class="form-control" type="text">  
261 - </div>  
262 - </div>  
263 - <div class="form-group">  
264 - <label class="col-sm-3 control-label">处理质量：</label>  
265 - <div class="col-sm-8">  
266 - <input id="treatmentQuality" name="treatmentQuality" th:field="*{treatmentQuality}" class="form-control" type="text">  
267 - </div>  
268 - </div>  
269 - <div class="form-group" th:if="${isBattery}">  
270 - <label class="col-sm-3 control-label">废弃物去向：</label>  
271 - <div class="col-sm-8">  
272 - <input id="wasteDestination" name="wasteDestination" th:field="*{wasteDestination}" class="form-control" type="text">  
273 - </div>  
274 - </div>  
275 - <div class="form-group" th:if="${isBattery}">  
276 - <label class="col-sm-3 control-label">电池个数：</label>  
277 - <div class="col-sm-8">  
278 - <input id="batteryQty" name="batteryQty" th:field="*{batteryQty}" class="form-control" type="text">  
279 - </div>  
280 - </div>  
281 - <div class="form-group" th:if="${isBattery}">  
282 - <label class="col-sm-3 control-label">电池电量：</label>  
283 - <div class="col-sm-8">  
284 - <input id="electricQuantity" name="electricQuantity" th:field="*{electricQuantity}" class="form-control" type="text">  
285 - </div>  
286 - </div>  
287 - <div class="form-group" th:if="${isBattery}">  
288 - <label class="col-sm-3 control-label">电池包编码：</label>  
289 - <div class="col-sm-8">  
290 - <input id="batteryPageCode" name="batteryPageCode" th:field="*{batteryPageCode}" class="form-control" type="text">  
291 - </div>  
292 - </div>  
293 -  
294 - <div class="form-group" th:if="${isBattery}">  
295 - <label class="col-sm-3 control-label">再生物质名称：</label>  
296 - <div class="col-sm-8">  
297 - <input id="regenerateSubstanceName" name="regenerateSubstanceName" th:field="*{regenerateSubstanceName}" class="form-control" type="text">  
298 - </div>  
299 - </div>  
300 - <div class="form-group" th:if="${isBattery}">  
301 - <label class="col-sm-3 control-label">再生利用率：</label>  
302 - <div class="col-sm-8">  
303 - <input id="regenerateUtilizationRate" name="regenerateUtilizationRate" th:field="*{regenerateUtilizationRate}" class="form-control" type="text">  
304 - </div>  
305 - </div>  
306 - <div class="form-group" th:if="${isBattery}">  
307 - <label class="col-sm-3 control-label">物质再生质量：</label>  
308 - <div class="col-sm-8">  
309 - <input id="substanceRegenerateQuality" name="substanceRegenerateQuality" th:field="*{substanceRegenerateQuality}" class="form-control" type="text">  
310 - </div>  
311 - </div>  
312 -  
313 -  
314 -  
315 -  
316 - 251 +<!-- <div class="form-group">-->
  252 +<!-- <label class="col-sm-3 control-label">出库质量(kg)：</label>-->
  253 +<!-- <div class="col-sm-8">-->
  254 +<!-- <input id="shipQuality" name="shipQuality" th:field="*{shipQuality}" class="form-control" type="text">-->
  255 +<!-- </div>-->
  256 +<!-- </div>-->
  257 +<!-- <div class="form-group" th:if="${isBattery}">-->
  258 +<!-- <label class="col-sm-3 control-label">再生日期：</label>-->
  259 +<!-- <div class="col-sm-8">-->
  260 +<!-- <input id="regenerateDate" name="regenerateDate" th:field="*{regenerateDate}" class="form-control" type="text">-->
  261 +<!-- </div>-->
  262 +<!-- </div>-->
  263 +<!-- <div class="form-group">-->
  264 +<!-- <label class="col-sm-3 control-label">处理质量：</label>-->
  265 +<!-- <div class="col-sm-8">-->
  266 +<!-- <input id="treatmentQuality" name="treatmentQuality" th:field="*{treatmentQuality}" class="form-control" type="text">-->
  267 +<!-- </div>-->
  268 +<!-- </div>-->
  269 +<!-- <div class="form-group" th:if="${isBattery}">-->
  270 +<!-- <label class="col-sm-3 control-label">废弃物去向：</label>-->
  271 +<!-- <div class="col-sm-8">-->
  272 +<!-- <input id="wasteDestination" name="wasteDestination" th:field="*{wasteDestination}" class="form-control" type="text">-->
  273 +<!-- </div>-->
  274 +<!-- </div>-->
  275 +<!-- <div class="form-group" th:if="${isBattery}">-->
  276 +<!-- <label class="col-sm-3 control-label">电池个数：</label>-->
  277 +<!-- <div class="col-sm-8">-->
  278 +<!-- <input id="batteryQty" name="batteryQty" th:field="*{batteryQty}" class="form-control" type="text">-->
  279 +<!-- </div>-->
  280 +<!-- </div>-->
  281 +<!-- <div class="form-group" th:if="${isBattery}">-->
  282 +<!-- <label class="col-sm-3 control-label">电池电量：</label>-->
  283 +<!-- <div class="col-sm-8">-->
  284 +<!-- <input id="electricQuantity" name="electricQuantity" th:field="*{electricQuantity}" class="form-control" type="text">-->
  285 +<!-- </div>-->
  286 +<!-- </div>-->
  287 +<!-- <div class="form-group" th:if="${isBattery}">-->
  288 +<!-- <label class="col-sm-3 control-label">电池包编码：</label>-->
  289 +<!-- <div class="col-sm-8">-->
  290 +<!-- <input id="batteryPageCode" name="batteryPageCode" th:field="*{batteryPageCode}" class="form-control" type="text">-->
  291 +<!-- </div>-->
  292 +<!-- </div>-->
317 293
  294 +<!-- <div class="form-group" th:if="${isBattery}">-->
  295 +<!-- <label class="col-sm-3 control-label">再生物质名称：</label>-->
  296 +<!-- <div class="col-sm-8">-->
  297 +<!-- <input id="regenerateSubstanceName" name="regenerateSubstanceName" th:field="*{regenerateSubstanceName}" class="form-control" type="text">-->
  298 +<!-- </div>-->
  299 +<!-- </div>-->
  300 +<!-- <div class="form-group" th:if="${isBattery}">-->
  301 +<!-- <label class="col-sm-3 control-label">再生利用率：</label>-->
  302 +<!-- <div class="col-sm-8">-->
  303 +<!-- <input id="regenerateUtilizationRate" name="regenerateUtilizationRate" th:field="*{regenerateUtilizationRate}" class="form-control" type="text">-->
  304 +<!-- </div>-->
  305 +<!-- </div>-->
  306 +<!-- <div class="form-group" th:if="${isBattery}">-->
  307 +<!-- <label class="col-sm-3 control-label">物质再生质量：</label>-->
  308 +<!-- <div class="col-sm-8">-->
  309 +<!-- <input id="substanceRegenerateQuality" name="substanceRegenerateQuality" th:field="*{substanceRegenerateQuality}" class="form-control" type="text">-->
  310 +<!-- </div>-->
  311 +<!-- </div>-->
318 <div class="form-group"> 312 <div class="form-group">
319 <div class="col-sm-8"> 313 <div class="col-sm-8">
320 <input id="status" name="status" th:field="*{status}" class="form-control" type="hidden" > 314 <input id="status" name="status" th:field="*{status}" class="form-control" type="hidden" >
321 </div> 315 </div>
322 </div> 316 </div>
323 - <div class="form-group">  
324 - <label class="col-sm-3 control-label">创建时间：</label>  
325 - <div class="col-sm-8">  
326 - <input id="created" name="created" th:field="*{created}" class="form-control" type="text" readonly="readonly">  
327 - </div>  
328 - </div>  
329 - <div class="form-group">  
330 - <label class="col-sm-3 control-label">创建用户：</label>  
331 - <div class="col-sm-8">  
332 - <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="readonly">  
333 - </div>  
334 - </div>  
335 - <div class="form-group">  
336 - <label class="col-sm-3 control-label">最后修改时间：</label>  
337 - <div class="col-sm-8">  
338 - <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text" readonly="readonly">  
339 - </div>  
340 - </div>  
341 - <div class="form-group">  
342 - <label class="col-sm-3 control-label">更新用户：</label>  
343 - <div class="col-sm-8">  
344 - <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">  
345 - </div>  
346 - </div> 317 +<!-- <div class="form-group"> -->
  318 +<!-- <label class="col-sm-3 control-label">创建时间：</label>-->
  319 +<!-- <div class="col-sm-8">-->
  320 +<!-- <input id="created" name="created" th:field="*{created}" class="form-control" type="text" readonly="readonly">-->
  321 +<!-- </div>-->
  322 +<!-- </div>-->
  323 +<!-- <div class="form-group"> -->
  324 +<!-- <label class="col-sm-3 control-label">创建用户：</label>-->
  325 +<!-- <div class="col-sm-8">-->
  326 +<!-- <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="readonly">-->
  327 +<!-- </div>-->
  328 +<!-- </div>-->
  329 +<!-- <div class="form-group"> -->
  330 +<!-- <label class="col-sm-3 control-label">最后修改时间：</label>-->
  331 +<!-- <div class="col-sm-8">-->
  332 +<!-- <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text" readonly="readonly">-->
  333 +<!-- </div>-->
  334 +<!-- </div>-->
  335 +<!-- <div class="form-group"> -->
  336 +<!-- <label class="col-sm-3 control-label">更新用户：</label>-->
  337 +<!-- <div class="col-sm-8">-->
  338 +<!-- <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="readonly">-->
  339 +<!-- </div>-->
  340 +<!-- </div>-->
347 <!--<div class="form-group"> --> 341 <!--<div class="form-group"> -->
348 <!--<label class="col-sm-3 control-label">自定义字段1：</label>--> 342 <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
349 <!--<div class="col-sm-8">--> 343 <!--<div class="col-sm-8">-->