Commit 0a5beb54c07ea337406a375003ef331fc0da3d34
1 parent
626c3cd0
盘点BUG修复
Showing
2 changed files
with
6 additions
and
3 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
... | ... | @@ -135,6 +135,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap |
135 | 135 | //查询该条库存明细 |
136 | 136 | InventoryDetail inventoryDetail = inventoryDetailService.getById(inventoryDetailId); |
137 | 137 | //写入盘点明细 |
138 | + if(!inventoryDetail.getCompanyCode().equals(cyclecountHeader.getCompanyCode())){ | |
139 | + throw new ServiceException("库存与盘点主单货主不一致!"); | |
140 | + } | |
138 | 141 | CycleCountDetail ccd = new CycleCountDetail(); |
139 | 142 | ccd.setPreferenceCode(preferenceCode); |
140 | 143 | ccd.setCycleCountHeadCode(cyclecountHeader.getCode()); |
... | ... |
src/main/resources/templates/inventory/cycleCountDetail/add.html
... | ... | @@ -11,6 +11,9 @@ |
11 | 11 | <input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}"> |
12 | 12 | <div class="select-list"> |
13 | 13 | <ul> |
14 | + <li> | |
15 | + 货主编码:<input type="text" id="companyCode" name="companyCode" th:value="${companyCode}" readonly="readonly" /> | |
16 | + </li> | |
14 | 17 | <li> |
15 | 18 | 库存头ID:<input id="inventoryHeaderId" type="text" name="inventoryHeaderId"/> |
16 | 19 | </li> |
... | ... | @@ -41,9 +44,6 @@ |
41 | 44 | 供应商编码:<input type="text" name="supplierCode"/> |
42 | 45 | </li> |
43 | 46 | <li> |
44 | - 货主编码:<input type="text" name="companyCode"/> | |
45 | - </li> | |
46 | - <li> | |
47 | 47 | 上游单号:<input type="text" name="referCode"/> |
48 | 48 | </li> |
49 | 49 | <li> |
... | ... |