From 81456046161696d3e1e31a8d9eb428f3b7a3442f Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 22 九月 2022 10:44:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
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 浜у搧浠ｇ爜,宸ヨ壓璺嚎浠ｇ爜 from diyipi ", "diyipi");
+ ds = oCN.RunProcReturn("select distinct 浜у搧浠ｇ爜,isnull(宸ヨ壓璺嚎浠ｇ爜,'') 宸ヨ壓璺嚎浠ｇ爜 from diyipi ", "diyipi");
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
{
var HBillNo = ds.Tables[0].Rows[i]["宸ヨ壓璺嚎浠ｇ爜"].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]["浜у搧浠ｇ爜"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
}
--
Gitblit v1.9.1