From 9a1462644155f965f250686e5adc2042168d0594 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:37:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(buildpackage):=20=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=BB=E9=94=AE=E5=AD=97=E6=AE=B5=E6=98=A0?=
=?UTF-8?q?=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 ConsignmachiningIn 中添加采购订单主键字段映射到 vdef20
- 在 ConsignmachiningInReturn 中添加来源明细主键和来源表头主键字段映射
- 在 ConsignmachiningInBodyDto 中新增 csourcebillbid 和 csourcebillhid 字段
---
.../frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java | 1 +
.../plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java | 4 +++-
.../frame/plugin/lets/u8cdto/ConsignmachiningInBodyDto.java | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
index 538925d9..1560228d 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
@@ -502,6 +502,7 @@ public class ConsignmachiningIn extends PluginBaseEntity {
scorderBodyDto.setDplanarrvdate(generateBusinessDate);//计划到货日期
// scorderBodyDto.setVdef16(bomVersion.get(0).getVersion());//版本号
// scorderBodyDto.setVdef16(null);//版本号
+ scorderBodyDto.setVdef20(stockinB.getRefOrderDetailId());//O采购订单主键
scorderBodyDtoArrayList.add(scorderBodyDto);
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
index 48b9dbb4..a50e7119 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
@@ -465,10 +465,12 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
consignmachiningInBodyDto.setNprice(noriginalcurprice.stripTrailingZeros().toPlainString());//单价（含税单价）
consignmachiningInBodyDto.setCsourcetype("61");//来源单据类型
consignmachiningInBodyDto.setVsourcerowno(u8cPoOrderDetail.getCrowno());//来源单据行号
- consignmachiningInBodyDto.setVsourcebillcode(scOrderEntity.getVordercode());//来源单据号
+// consignmachiningInBodyDto.setVsourcebillcode(scOrderEntity.getVordercode());//来源单据号
// consignmachiningInBodyDto.setWriteofftype("按备料发料核销");//核销方式，和妮姐已经确认，不用传递
consignmachiningInBodyDto.setDbizdate(generateBusinessDate);// 入库日期
// consignmachiningInBodyDto.setVdef16(bomVersion.get(0).getVersion());//BOM version
+ consignmachiningInBodyDto.setCsourcebillbid(u8cPoOrderDetail.getCorderBid());//来源明细主键
+ consignmachiningInBodyDto.setCsourcebillhid(scOrderEntity.getCorderid());//来源表头主键
consignmachiningInBodyDtoArrayList.add(consignmachiningInBodyDto);
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInBodyDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInBodyDto.java
index 9f623754..d7a29940 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInBodyDto.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/ConsignmachiningInBodyDto.java
@@ -21,4 +21,6 @@ public class ConsignmachiningInBodyDto {
private String writeofftype;//核销方式
private String dbizdate;
private String vdef16;
+ private String csourcebillbid;//来源明细主键
+ private String csourcebillhid;//来源表头主键
}