From d1b46a8cc14e106ead20fc2e6d936d55fb15193d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 19 九月 2022 15:41:05 +0800
Subject: [PATCH] 工艺路线导入 单据号为空 问题
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 4 ++--
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 19 ++++++++++++++++++-
WebAPI/Controllers/BLL/Xt_UserController.cs | 6 +++---
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index e7bf010..e04db05 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -86,9 +86,9 @@
// return objJsonResult;
//}
- Int64 lngBillKey = 0;
- lngBillKey = DBUtility.ClsPub.isLong(HCzybm);
- if (lngBillKey == 0)
+ string lngBillKey = "";
+ lngBillKey = DBUtility.ClsPub.isStrNull(HCzybm);
+ if (lngBillKey == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index f18ccfb..d2fde60 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -56,7 +56,7 @@
public string HSortFlag;
public string HSelTotal;
public string HColumnWidth;
-
+
}
public class grdAlignmentSub
{
@@ -123,7 +123,7 @@
") values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
"," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" +
",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
- ","+ (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
+ "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
objJsonResult.code = "1";
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