diff --git a/src/main/java/com/gaotao/modules/check/entity/CountAdjustmentTransSubData.java b/src/main/java/com/gaotao/modules/check/entity/CountAdjustmentTransSubData.java index 276a576..847d68b 100644 --- a/src/main/java/com/gaotao/modules/check/entity/CountAdjustmentTransSubData.java +++ b/src/main/java/com/gaotao/modules/check/entity/CountAdjustmentTransSubData.java @@ -33,7 +33,12 @@ public class CountAdjustmentTransSubData { private Double itemNo; /** - * 子行号 + * 序号 + */ + private Double seqNo; + + /** + * 标签号(sub_no就是handling_unit的unit_id) */ private String subNo; @@ -52,11 +57,6 @@ public class CountAdjustmentTransSubData { */ private String directionDesc; - /** - * 标签号 - */ - private String handlingUnitId; - /** * 物料号 */ @@ -81,5 +81,15 @@ public class CountAdjustmentTransSubData { * 栈板号(存储在order_ref1) */ private String palletId; + + /** + * WDR(存储在order_ref3) + */ + private String wdr; + + /** + * 仓库(存储在order_ref4) + */ + private String warehouseId; } diff --git a/src/main/java/com/gaotao/modules/check/service/impl/CountAdjustmentServiceImpl.java b/src/main/java/com/gaotao/modules/check/service/impl/CountAdjustmentServiceImpl.java index 398989f..4c2682c 100644 --- a/src/main/java/com/gaotao/modules/check/service/impl/CountAdjustmentServiceImpl.java +++ b/src/main/java/com/gaotao/modules/check/service/impl/CountAdjustmentServiceImpl.java @@ -254,16 +254,16 @@ public class CountAdjustmentServiceImpl implements CountAdjustmentService { // 创建trans_detail和trans_detail_sub - rqrq int itemNo = 1; for (CountAdjustmentItem item : items) { - // 创建trans_detail - rqrq - TransDetail detail = createTransDetail(transNo, itemNo, item, "OUT"); + // 创建trans_detail(盘亏direction='-')- rqrq + TransDetail detail = createTransDetail(transNo, itemNo, item, "-"); countAdjustmentMapper.insertTransDetail(detail); - // 创建trans_detail_sub(按标签)- rqrq - int subNo = 1; + // 创建trans_detail_sub(按标签,seq_no是序号,sub_no是标签号)- rqrq + int seqNo = 1; for (CountAdjustmentLabelItem label : item.getLabelItems()) { - TransDetailSub sub = createTransDetailSub(transNo, itemNo, subNo, label, "OUT"); + TransDetailSub sub = createTransDetailSub(transNo, itemNo, seqNo, label, "-"); countAdjustmentMapper.insertTransDetailSub(sub); - subNo++; + seqNo++; } // 减少库存 - rqrq @@ -318,16 +318,16 @@ public class CountAdjustmentServiceImpl implements CountAdjustmentService { // 创建trans_detail和trans_detail_sub - rqrq int itemNo = 1; for (CountAdjustmentItem item : items) { - // 创建trans_detail - rqrq - TransDetail detail = createTransDetail(transNo, itemNo, item, "IN"); + // 创建trans_detail(盘盈direction='+')- rqrq + TransDetail detail = createTransDetail(transNo, itemNo, item, "+"); countAdjustmentMapper.insertTransDetail(detail); - // 创建trans_detail_sub(按标签)- rqrq - int subNo = 1; + // 创建trans_detail_sub(按标签,seq_no是序号,sub_no是标签号)- rqrq + int seqNo = 1; for (CountAdjustmentLabelItem label : item.getLabelItems()) { - TransDetailSub sub = createTransDetailSub(transNo, itemNo, subNo, label, "IN"); + TransDetailSub sub = createTransDetailSub(transNo, itemNo, seqNo, label, "+"); countAdjustmentMapper.insertTransDetailSub(sub); - subNo++; + seqNo++; } // 增加库存 - rqrq @@ -395,22 +395,34 @@ public class CountAdjustmentServiceImpl implements CountAdjustmentService { /** * 创建事务子明细 - rqrq + * + *
字段说明:
+ *