From f0b15e2fc7bdccb18d27cba0c9dfd667e36c20a6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 七月 2024 17:56:46 +0800
Subject: [PATCH] 不良评审申请单,选着工序流转卡,查询数据增加过滤条件,设备故障登记单,生产质量汇报单,异常反馈单, 取样单,增加字段保存
---
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 66abec4..520f9c4 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1170,7 +1170,7 @@
string sql = string.Format(@"select * from h_v_Sc_ProcessExchangeBillQuerySub");
- ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 鍑虹珯鍏宠仈鏁伴噺=0 and cast(娴佹按鍙� as int)>" + ds1 .Tables[0].Rows[0][0].ToString(), "h_v_Sc_ProcessExchangeBillQuerySub");
+ ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 鍑虹珯鍏宠仈鏁伴噺=0 and cast(娴佹按鍙� as int)>" + ds1 .Tables[0].Rows[0][0].ToString()+ " order by cast(娴佹按鍙� as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
if (float.Parse(ds.Tables[0].Rows[0]["杩涚珯鍏宠仈鏁伴噺"].ToString()) > 0)
{
@@ -1246,9 +1246,9 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+ int num = oItem.HBillNo.Split('-').Length;
oBill.omodel.HMaker = msg5; //鍒跺崟浜�
- oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[1]);
+ oBill.omodel.HNo = DBUtility.ClsPub.isLong(oItem.HBillNo.Split('-')[num - 1]);
oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
oBill.omodel.HDate = oItem.HDate;// 鏃ユ湡
@@ -1256,6 +1256,7 @@
oBill.omodel.HPlanEndDate = oItem.HPlanEndDate;// 璁″垝瀹屽伐鏃ユ湡
oBill.omodel.HQty = oItem.HQty;// 鏁伴噺
oBill.omodel.HBillNo = oItem.HBillNo;// 鍗曟嵁鍙�
+ oBill.omodel.HProjectNum = oItem.HProjectNum;// 椤圭洰鍙�
}
//琛ㄤ綋鏁版嵁
@@ -1311,7 +1312,6 @@
j++;
}
}
-
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
--
Gitblit v1.9.1