From 79e17fd46fcdda2933829db576fd1570c440c719 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:42:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(outsourc):=E4=BC=98=E5=8C=96=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=9B=E5=BB=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91-=20=E6=9B=B4=E6=96=B0=E5=8E=9F=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8OFS=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E6=9B=BF=E4=BB=A3O=E9=87=87=E8=B4=AD=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E4=B8=BB=E9=94=AE-=20=E7=A7=BB=E9=99=A4BOM?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E8=AE=BE=E7=BD=AE=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=9B=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF=20-=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96JSON=E5=BA=8F=E5=88=97=E5=8C=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E7=A9=BA=E5=80=BC=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=20-=20=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A=E5=92=8C=E5=91=BD=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/outsourc/ConsignmachiningIn.java | 13 +++++++++---- .../plugin/outsourc/ConsignmachiningInReturn.java | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) 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 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> 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) {