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 aa43b36c..538925d9 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
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.hzya.frame.base.PluginBaseEntity;
 import com.hzya.frame.beanutil.BeanUtil;
 import com.hzya.frame.plugin.lets.constant.OverallConstant;
@@ -460,8 +461,10 @@ public class ConsignmachiningIn extends PluginBaseEntity {
                             poOrderParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl());//收发类别
                             poOrderParentDto.setVdef3(bdRdclEntity.getRdname());
                             poOrderParentDto.setVdef17(ProfilesActiveConstant.sourceSystem1);//来源系统
-                            poOrderParentDto.setVdef19(consignmachiningInSonDto.getCode());//原单单号
-                            poOrderParentDto.setVdef20(consignmachiningInSonDto.getId());//原单主键
+                            poOrderParentDto.setVdef19(consignmachiningInSonDto.getCode());//原单单号，O采购入库单单号
+//                            poOrderParentDto.setVdef20(consignmachiningInSonDto.getId());//原单主键，O采购入库单主键
+                            //2025年1月22日 17:33:43 原单主键，使用OFS采购订单主键
+                            poOrderParentDto.setVdef20(ofsPoOrderDataHeader.getId());
 
                             //委外入库表头明细行
                             List<ScorderBodyDto> scorderBodyDtoArrayList = new ArrayList<>();
@@ -494,9 +497,11 @@ public class ConsignmachiningIn extends PluginBaseEntity {
                                 scorderBodyDto.setNordernum(stockinB.getReceivedQty());//数量
                                 scorderBodyDto.setNoriginalnetprice(noriginalcurprice.stripTrailingZeros().toPlainString());//净单价
                                 scorderBodyDto.setCwarehouseid(bdStordocEntity.getPkStordoc());//仓库
-                                scorderBodyDto.setBomversion(bomVersion.get(0).getVersion());//BOM版本
+//                                scorderBodyDto.setBomversion(bomVersion.get(0).getVersion());//BOM版本
+                                scorderBodyDto.setBomversion(null);//BOM版本
                                 scorderBodyDto.setDplanarrvdate(generateBusinessDate);//计划到货日期
 //                                scorderBodyDto.setVdef16(bomVersion.get(0).getVersion());//版本号
+//                                scorderBodyDto.setVdef16(null);//版本号
                                 scorderBodyDtoArrayList.add(scorderBodyDto);
                             }
 
@@ -508,7 +513,7 @@ public class ConsignmachiningIn extends PluginBaseEntity {
 
                             Map<String, List<ScorderDto>> stringStringMap = new HashMap<>();
                             stringStringMap.put("OrderVO", scorderDtoArrayList);
-                            ScOrderResultDto scOrderResultDto = sendU8cScorder(JSON.toJSONString(stringStringMap));
+                            ScOrderResultDto scOrderResultDto = sendU8cScorder(JSON.toJSONString(stringStringMap, SerializerFeature.WriteMapNullValue));
 
                             String cgeneralhid = null;
                             String vbillcode = null;
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 ed7e4852..48b9dbb4 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
@@ -569,6 +569,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
                         }
 
                         //2024年8月30日 13:28:46 查询原委外订单(取的是钉钉推送到U8C的委外订单)，查询逻辑：OFS采退出库单 -> OFS采退订单 -> OFS采购订单
+                        //得到OFS采购订单
                         OfsPoOrderData ofsPoOrder = queryOfsPoOrder(purchaseReturnOrder);
 
                         //2024年8月30日 13:35:16 根据OFS采购订单，查询OFS委外订单
@@ -990,7 +991,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
     /**
      * 查询委外订单表头对象
      *
-     * @param ofsPoOrderId OFS采退订单主键
+     * @param ofsPoOrderId OFS采购订单主键
      * @author liuyang
      */
     private ScOrderEntity queryScOrder(String ofsPoOrderId) {