From 8658c02633f9746781d2e6f5da9998eef8c0e0a7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 28 十月 2022 16:31:52 +0800
Subject: [PATCH] 动态列(点检项目、维修项目、维修检验项目、保养项目、产品与器具清单及维护、工作中心、工序、生产资源、生产班组、不良原因、故障原因、检验项目、检验项目分类、工序工价及维护、系统上机日志查询、系统参数查询、系统模块信息查询、系统单据类型、会计期间、公告信息维护)

---
 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index aab3a29..c3ac9dd 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -670,11 +670,28 @@
                 omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
 
 
-                ds = oCN.RunProcReturn("select  distinct 浜у搧浠g爜,宸ヨ壓璺嚎浠g爜 from  diyipi ", "diyipi");
+                ds = oCN.RunProcReturn("select  distinct 浜у搧浠g爜,isnull(宸ヨ壓璺嚎浠g爜,'') 宸ヨ壓璺嚎浠g爜 from  diyipi ", "diyipi");
 
                 for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                 {
                     var HBillNo = ds.Tables[0].Rows[i]["宸ヨ壓璺嚎浠g爜"].ToString();//鑾峰緱涓�涓柊鐨勫崟鎹彿
+                    if (HBillNo == "")
+                    {
+                        DataSet dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='1' ", "Gy_RoutingBillMain");
+                        while (1 == 1)
+                        {
+                            if (HBillNo != "")
+                            {
+                                if (dataSet.Tables[0].Rows.Count==0)
+                                {
+                                    break;
+                                }
+                            }
+                            HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+                            dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='{HBillNo}' ", "Gy_RoutingBillMain");
+                        }
+
+                    }
                     var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
                     oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["浜у搧浠g爜"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
                 }

--
Gitblit v1.9.1