From fc740242a46b8fa4d1c4e3623bb0b87eb6867655 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Sun, 15 Jun 2025 19:43:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=20=E6=9C=80=E7=BB=88=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8D=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=8F=96=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RequisitionOrderPluginServiceImpl.java    | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/praybill/service/impl/RequisitionOrderPluginServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/praybill/service/impl/RequisitionOrderPluginServiceImpl.java
index 68710684..1b17121b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/praybill/service/impl/RequisitionOrderPluginServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/praybill/service/impl/RequisitionOrderPluginServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hzya.frame.plugin.oa.praybill.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Assert;
@@ -216,9 +217,12 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
         String pk_org_v = formmainData.getString("field0051");
         for(int i = 0; i< forsonData.size(); i++){
             JSONObject forson = forsonData.getJSONObject(i);
+            String field0020 = forson.getString("field0020");
+            String field0040 = forson.getString("field0040");
+            String nnum = StrUtil.isNotEmpty(field0040) ? field0040 : field0020;
             JSONObject praybillB = new JSONObject();
             praybillB.put("crowno",forson.getString("field0014"));
-            praybillB.put("nnum",forson.getString("field0020"));
+            praybillB.put("nnum",nnum);
             praybillB.put("pk_org",pk_org);
             praybillB.put("pk_org_v",pk_org_v);
             praybillB.put("vchangerate","1");
@@ -226,7 +230,7 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
             praybillB.put("pk_material",forson.getString("field0031"));//物料pk
             praybillB.put("castunitid",forson.getString("field0055"));//计量单位pk
             praybillB.put("cunitid",forson.getString("field0055"));//计量单位pk
-            praybillB.put("nastnum",forson.getString("field0020"));//数量
+            praybillB.put("nastnum",nnum);//数量
             praybillB.put("dreqdate",forson.getString("field0021"));//需求日期
             praybillB.put("dsuggestdate",forson.getString("field0022"));//建议订货日期
             praybillB.put("pk_purchaseorg",pk_org);//采购组织
@@ -250,26 +254,10 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
     }
 
     public static void main(String[] args) {
-        String result = "{\"msg\":\"转发失败\",\"type\":null,\"flag\":false,\"status\":\"500\",\"attribute\":{\"code\":\"success\",\"data\":{\"bodyVOList\":[{\"rowno\":\"1\",\"pk_material\":\"1001P1100000000IT34Q\",\"id\":\"1001A3100000001B2UOG\"}],\"headVO\":{\"code\":\"QG2025060800000182\",\"id\":\"1001A3100000001B2UOF\",\"vtrantypeid\":\"1001P1100000000IR21W\"}},\"message\":\"提示：========NCC-请购单保存提交《成功》！！！========。单据信息：《id》 = 1001A3100000001B2UOF  ,《code》 = QG2025060800000182\"}}";
-        JSONObject resultJson = JSONObject.parseObject(result);
-        JSONObject attribute = resultJson.getJSONObject("attribute");
-        if (null != attribute){
-            String code = attribute.getString("code");
-            if ("success".equals(code)){
-                JSONObject data = attribute.getJSONObject("data");
-                if (null != data){
-                    JSONObject headVO = data.getJSONObject("headVO");
-                    if (null != headVO){
-                        String vbillcode = headVO.getString("code");
-                        System.out.println(vbillcode);
-                    }
-                }
-            }
-        }
-        JSONObject headers =new JSONObject();
-        headers.put("creator","1001P1100000000NUULI");
-        RequisitionOrderPluginServiceImpl service = new RequisitionOrderPluginServiceImpl();
-        service.uploadFile("-333447786976688302",headers,"8000640003","1001A3100000001B4COB");
+        String field0020 = null;
+        String field0040 = "22";
+        String s = StrUtil.isNotEmpty(field0040) ? field0040 : field0020;
+        System.out.println(s);
     }
     //保存日志
     public void saveLog(String integration_task_living_details_id, Boolean flag, IntegrationTaskLivingDetailsEntity taskLivingDetail){