组盘明细添加托盘编号参数

Signed-off-by: TanYibin <5491541@qq.com>

组盘明细添加托盘编号参数
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent cd858e5f
Showing 3 changed files with 6 additions and 1 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/entity/ReceiptContainerDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -45,7 +45,7 @@ public class OperationLogServiceImpl extends ServiceImpl&lt;OperationLogMapper, Ope
                             continue;
                         }
                         String msg = StrUtil.format("上游单号：{}，入库单据号：{}，仓库编码：{}，托盘编码：{}，物料编码：{}，入库数量：{}", receiptContainerDetail.getReferCode(),
-                            receiptContainerDetail.getReceiptCode(), receiptContainerDetail.getWarehouseCode(), receiptContainerDetail.getReceiptContainerId(),
+                            receiptContainerDetail.getReceiptCode(), receiptContainerDetail.getWarehouseCode(), receiptContainerDetail.getContainerCode(),
                             receiptContainerDetail.getMaterialCode(), receiptContainerDetail.getQty());
                         OperationLog operationLog = new OperationLog();
                         operationLog.setBizId(receiptContainerDetail.getUniqueCode());
@@ -39,6 +39,10 @@ public class ReceiptContainerDetail implements Serializable {
     /** 入库单详情ID */
     @ApiModelProperty(value = "入库单详情ID")
     private Integer receiptDetailId;
+    /** 容器号 */
+    @Excel(name = "容器号", width = 15)
+    @ApiModelProperty(value = "容器号")
+    private String containerCode;
     /** 入库单编码 */
     @ApiModelProperty(value = "入库单编码")
     private String receiptCode;
@@ -207,6 +207,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
                 receiptContainerDetail.setCompanyCode(receiptDetail.getCompanyCode());
                 receiptContainerDetail.setReferCode(receiptDetail.getReferCode());
                 receiptContainerDetail.setUniqueCode(receive.getUniqueCode());
+                receiptContainerDetail.setContainerCode(receive.getContainerCode());
                 receiptContainerDetail.setReceiptDetailId(receiptDetail.getId());
                 receiptContainerDetail.setReceiptId(receiptDetail.getReceiptId());
                 receiptContainerDetail.setReceiptCode(receiptDetail.getReceiptCode());