From 93b9f26c4581fa9d39f064a453fc21a67d582152 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 28 六月 2022 08:46:12 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 178 ++++++++++++++++++++---------------------------------------
1 files changed, 61 insertions(+), 117 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 170e0df..44b51be 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -428,18 +428,11 @@
return objJsonResult;
}
- string hnumber = "";
- if (tb2.Rows.Count > 0)
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["浜у搧浠ｇ爜"].ToString());
- }
-
for (int i = 0; i <= tb2.Rows.Count - 1; i++)
{
string sHNumber = "";
if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()) != "")
{
- //
sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
@@ -451,41 +444,14 @@
return objJsonResult;
}
- if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()))
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
{
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i+1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
- else
- {
- hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
- sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
-
- //瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寰楀埌鐗╂枡鍐呯爜
- if (!oMaterHlp.GetInfoByNumber(sHNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
else
@@ -652,7 +618,7 @@
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.Message = objJsonResult.Message;
objJsonResult.data = null;
return objJsonResult;
}
@@ -694,30 +660,16 @@
var hnumber = "";
var HBillNo = "";
long HInterID = 0;
+ int[] num = new int[2] { 1, 0 };
+
for (int i = 0; i < list.Count; i++)
{
//鑾峰彇鐗╂枡鏁版嵁
- ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber=" + list[i]["浜у搧浠ｇ爜"].ToString() + " and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
+ ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber='" + list[i]["浜у搧浠ｇ爜"].ToString() + "' and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
- var Hunitid = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
- var HUnitNumber = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
-
- //鑾峰彇宸ュ簭
- ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber=" + list[i]["宸ュ簭浠ｇ爜"].ToString(), "Gy_Process");
- var HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- //鑾峰彇宸ヤ綔涓績
- ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber=" + list[i]["宸ヤ綔涓績浠ｇ爜"].ToString(), "Gy_WorkCenter");
- var HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
-
- if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
- {
- hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
- HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- }
-
+ var Hunitid = ds.Tables[0].Rows[0]["Hunitid"].ToString();
+ var HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString();
var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
@@ -725,17 +677,51 @@
var HMaterTexture = list[i]["鏉愯川"].ToString();
var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
var HVerNum = list[i]["鐗堟湰"].ToString();
+ var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
+ if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
+ {
+ //鑾峰彇鐩稿悓涓昏〃鐨勫瓙琛ㄧ殑娣诲姞娆℃暟 HEntryID
+ num[0] = 1;
+ hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+
+ //娣诲姞涓昏〃鏁版嵁
+ oCN.RunProc("insert into Gy_RoutingBillMain(HInterID, HBillNo, HYear, HPeriod, HBillType, HDate, HBillStatus, " +
+ "HMaker, HMakeDate,HMaterNumber, HMaterID, Hunitid, HUnitNumber, HName," +
+ "HPicNumVer, HPicNumAssemble, HMaterTexture, HProductNum, HVerNum, HRoutingGroupID, HStandard, HRemark,HMainPrice" +
+ ",HOrgID)values" +
+ $"({HInterID}, '{HBillNo}', {omdelMian.HYear}, {omdelMian.HPeriod}, '{BillType}', GETDATE(), 1" +
+ $", '{user}', GETDATE(), '{HMaterNumber}', {HMaterID}, {Hunitid}, '{HUnitNumber}', '{HName}'," +
+ $" '{HPicNumVer}', '{HPicNumAssemble}', '{HMaterTexture}', '{HProductNum}', '{HVerNum}', 0, 1, '',{(HMainPrice==""?"0":HMainPrice)}" +
+ $",{omdelMian.HOrgID})");
+ //鑾峰彇涓昏〃娣诲姞鐨勬鏁�
+ num[1]++;
+ }
//鑾峰彇渚涘簲鍟�
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where HNumber=" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString(), "h_v_Gy_SupplierList");
- var HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where 渚涘簲鍟嗕唬鐮�='" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString()+"'", "h_v_Gy_SupplierList");
+ var HSupID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鑾峰彇宸ュ簭
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber='" + list[i]["宸ュ簭浠ｇ爜"].ToString() + "'", "Gy_Process");
+ var HProcID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鑾峰彇宸ヤ綔涓績
+ ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HName='" + list[i]["宸ヤ綔涓績"].ToString() + "'", "Gy_WorkCenter");
+ var HCenterID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
- var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
@@ -753,63 +739,21 @@
var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
//鐗╂枡鍒嗙被
-
+ oCN.RunProc("Insert into Gy_RoutingBillSub (HInterID,HEntryID,HSupID,HProcID,HCenterID,HProcNO,HTimeUnit" +
+ ", hworkqty, HFixPrice, HBadPrice, HWasterPrice, HBeginFixQty, HBeginDayQty, HFixWorkDays" +
+ ", HTrunWorkDays, HAutoTrunFlag, HSupFlag, HTechnologyParameter, HPicNum, HProcCheckNote" +
+ ", hpassrate, hremark, HMouldNo, HProcWorkNum, HReadyTime, HQueueTime, HMoveTime, HUnitTime)values" +
+ $"({HInterID}, {num[0]}, {HSupID}, {HProcID},{HCenterID}, '{HProcNo}', '{HTimeUnit}'" +
+ $", {hworkqty}, {(HFixPrice==""?"0": HFixPrice)}, {(HBadPrice == "" ? "0": HBadPrice)}, {(HWasterPrice == "" ? "0": HWasterPrice)}, {(HBeginFixQty == "" ? "0": HBeginFixQty)}, {(HBeginDayQty == "" ? "0": HBeginDayQty)}, {(HFixWorkDays == "" ? "0": HFixWorkDays)}" +
+ $", {(HTrunWorkDays == "" ? "0": HTrunWorkDays)},{(HAutoTrunFlag == "True" ? "1": "0")},{(HSupFlag == "True" ? "1" : "0")}, '{HTechnologyParameter}', '{HPicNum}', '{HProcCheckNote}'" +
+ $", {hpassrate}, '{hremark}', '{HMouldNo}', '{HProcWorkNum}', 0, 0, 0, 0)");
+ //鑷娆℃暟
+ num[0]++;
}
-
-
- // //涓昏〃
- // oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
- // "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
- // "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
- // " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
- // " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
- // "HMainSourceInterID,HMainSourceEntryID)values" +
- // $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
- // $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
- // $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
- // $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
- // $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
- // $" {HMainSourceInterID},{HMainSourceEntryID})");
- //}
-
-
- // for (int j = 0; j < SumDay; j++)
- // {
- // //涓昏〃瀛愯〃閮芥湁鏁版嵁
- // if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
- // {
- // SumCount += 1;
- // ////淇濆瓨瀛愯〃
- // objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
- // , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
- // , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
- // , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
-
- // if (objJsonResult.count == 1)
- // {
- // TrueCount += 1;
- // }
- // }
- // //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
- // if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
- // {
- // objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
- // }
- // }
- //}
-
- //if (TrueCount != SumCount)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = objJsonResult.Message;
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = null;
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + num[1] + "涓伐鑹鸿矾绾�";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1