Commit ddeec92f9601b22b78c14ce733df72b9588e7bee
1 parent
aaebacdd
库存明细新增电池包二维码、成品物料码、原料批号搜索，成品入库将成品物料码传入库存明细中
Showing
5 changed files
with
40 additions
and
18 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
| ... | ... | @@ -76,6 +76,9 @@ public class InventoryDetailController extends BaseController |
| 76 | 76 | .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库 |
| 77 | 77 | .eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID |
| 78 | 78 | .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位 |
| 79 | + .eq(StringUtils.isNotEmpty(inventoryDetail.getBatteryPackTwoCode()),InventoryDetail::getBatteryPackTwoCode,inventoryDetail.getBatteryPackTwoCode()) //电池包二维码 | |
| 80 | + .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialBatch()),InventoryDetail::getMaterialBatch,inventoryDetail.getMaterialBatch()) //原料批号 | |
| 81 | + .eq(StringUtils.isNotEmpty(inventoryDetail.getBarMaterialCode()),InventoryDetail::getBarMaterialCode,inventoryDetail.getBarMaterialCode()) //成品物料码 | |
| 79 | 82 | .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器 |
| 80 | 83 | .eq(StringUtils.isNotEmpty(inventoryDetail.getSupplierCode()),InventoryDetail::getSupplierCode,inventoryDetail.getSupplierCode())//供应商 |
| 81 | 84 | .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码 |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
| ... | ... | @@ -477,6 +477,10 @@ public class InventoryDetail implements Serializable { |
| 477 | 477 | @ApiModelProperty(value="同步标识") |
| 478 | 478 | private Integer syncErp; |
| 479 | 479 | |
| 480 | + @TableField(value = "barMaterialCode") | |
| 481 | + @ApiModelProperty(value="成品物料码") | |
| 482 | + private String barMaterialCode; | |
| 483 | + | |
| 480 | 484 | |
| 481 | 485 | private static final long serialVersionUID = 1L; |
| 482 | 486 | } |
| 483 | 487 | \ No newline at end of file |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
| ... | ... | @@ -746,6 +746,7 @@ public class ReceiptTaskService { |
| 746 | 746 | barCodeHeader.setLastUpdatedBy(ShiroUtils.getLoginName()); |
| 747 | 747 | barCodeHeaderService.updateById(barCodeHeader); |
| 748 | 748 | inventoryDetail.setDayShift(barCodeDetail.getDayShift()); |
| 749 | + inventoryDetail.setBarMaterialCode(barCodeDetail.getCode()); | |
| 749 | 750 | inventoryDetail.setRegenerationCode(barCodeDetail.getRegenerationCode()); |
| 750 | 751 | inventoryDetail.setReceiptCode(barCodeHeader.getCode()); |
| 751 | 752 | inventoryDetail.setMaterialBatch(barCodeHeader.getMaterialBatch()); |
| ... | ... |
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
| ... | ... | @@ -25,6 +25,15 @@ |
| 25 | 25 | 物料名称：<input type="text" name="materialName"/> |
| 26 | 26 | </li> |
| 27 | 27 | <li> |
| 28 | + 电池包二维码：<input type="text" name="batteryPackTwoCode"/> | |
| 29 | + </li> | |
| 30 | + <li> | |
| 31 | + 原料批号：<input type="text" name="materialBatch"/> | |
| 32 | + </li> | |
| 33 | + <li> | |
| 34 | + 成品物料码：<input type="text" name="barMaterialCode"/> | |
| 35 | + </li> | |
| 36 | + <li> | |
| 28 | 37 | 物料规格：<input type="text" name="materialSpec"/> |
| 29 | 38 | </li> |
| 30 | 39 | <li> |
| ... | ... | @@ -36,9 +45,9 @@ |
| 36 | 45 | </option> |
| 37 | 46 | </select> |
| 38 | 47 | </li> |
| 39 | - <li> | |
| 40 | - 供应商编码：<input type="text" name="supplierCode"/> | |
| 41 | - </li> | |
| 48 | +<!-- <li>--> | |
| 49 | +<!-- 供应商编码：<input type="text" name="supplierCode"/>--> | |
| 50 | +<!-- </li>--> | |
| 42 | 51 | <li> |
| 43 | 52 | 货主： |
| 44 | 53 | <select id="companyCode" name="companyCode" th:with="list=${@companyService.getCode()}"> |
| ... | ... | @@ -46,12 +55,12 @@ |
| 46 | 55 | <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option> |
| 47 | 56 | </select> |
| 48 | 57 | </li> |
| 49 | - <li> | |
| 50 | - 上游单号：<input type="text" name="referCode"/> | |
| 51 | - </li> | |
| 52 | - <li> | |
| 53 | - 上游行号：<input type="text" name="referDetailId"/> | |
| 54 | - </li> | |
| 58 | +<!-- <li>--> | |
| 59 | +<!-- 上游单号：<input type="text" name="referCode"/>--> | |
| 60 | +<!-- </li>--> | |
| 61 | +<!-- <li>--> | |
| 62 | +<!-- 上游行号：<input type="text" name="referDetailId"/>--> | |
| 63 | +<!-- </li>--> | |
| 55 | 64 | <li> |
| 56 | 65 | 入库编码：<input type="text" name="receiptCode"/> |
| 57 | 66 | </li> |
| ... | ... | @@ -59,15 +68,15 @@ |
| 59 | 68 | 入库明细ID：<input type="text" name="receiptDetailId"/> |
| 60 | 69 | </li> |
| 61 | 70 | |
| 62 | - <li> | |
| 63 | - 项 目 号：<input type="text" name="projectNo"/> | |
| 64 | - </li> | |
| 65 | - <li> | |
| 66 | - 批 次：<input type="text" name="batch"/> | |
| 67 | - </li> | |
| 68 | - <li> | |
| 69 | - 批 号：<input type="text" name="lot"/> | |
| 70 | - </li> | |
| 71 | +<!-- <li>--> | |
| 72 | +<!-- 项 目 号：<input type="text" name="projectNo"/>--> | |
| 73 | +<!-- </li>--> | |
| 74 | +<!-- <li>--> | |
| 75 | +<!-- 批 次：<input type="text" name="batch"/>--> | |
| 76 | +<!-- </li>--> | |
| 77 | +<!-- <li>--> | |
| 78 | +<!-- 批 号：<input type="text" name="lot"/>--> | |
| 79 | +<!-- </li>--> | |
| 71 | 80 | |
| 72 | 81 | <li class="time2" style="height:30px"> |
| 73 | 82 | <label>创建时间： </label> |
| ... | ... | @@ -229,6 +238,10 @@ |
| 229 | 238 | align: 'center', |
| 230 | 239 | }, |
| 231 | 240 | { |
| 241 | + field : 'barMaterialCode', | |
| 242 | + title : '成品物料码', | |
| 243 | + }, | |
| 244 | + { | |
| 232 | 245 | field : 'materialBatch', |
| 233 | 246 | title : '原料批号', |
| 234 | 247 | }, |
| ... | ... |
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html