~yxj/MES-WEB-API.git

			@@ -36,14 +36,13 @@
			file.SaveAs(ExcelPath);

			NpoiHelper np = new NpoiHelper();
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1);
			DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,1,"0");

			//å é¤æä»¶
			File.Delete(ExcelPath);

			//åå»ºä¸´æ¶è¡¨
			DataTable tb2 = new DataTable("dt2");
			DataTable tb3 = new DataTable("dt3");

			//æ·»å åå
			for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
			@@ -56,10 +55,12 @@
			tb2.Columns.Add("åæ®å·", typeof(string));
			tb2.Columns.Add("HWorkShopID", typeof(Int32));//çäº§è½¦é´
			tb2.Columns.Add("HEmpID", typeof(Int32));//èå
			tb2.Columns.Add("åå·¥", typeof(string));//èå
			tb2.Columns.Add("HUnitID", typeof(Int32));//è®¡éåä½
			tb2.Columns.Add("HSourceID", typeof(Int32));//çäº§èµæºid
			tb2.Columns.Add("ICMOBillHInterID", typeof(Int32));//çäº§è®¢åä¸»id
			tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));//çäº§è®¢ååid
			tb2.Columns.Add("HProdORGID", typeof(Int32));//ç»ç»id

			//æ·»å æ°æ®
			for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
			@@ -71,8 +72,6 @@
			}
			tb2.Rows.Add(row);
			}

			ExcelDs.Tables.Add(tb2);

			var error = "";
			var ErrorResult = "";
			@@ -107,8 +106,10 @@
			ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");

			if (ds.Tables[0].Rows.Count == 0)
			{
			error += $"æ²¡æçäº§è®¢åä¿¡æ¯ï¼çäº§è®¢åå·:{ tb2.Rows[i]["çäº§è®¢åå·"].ToString()},çäº§è½¦é´ç¼ç :{tb2.Rows[i]["çäº§è½¦é´ç¼ç "].ToString()}" +
			$",çäº§è®¢åæç»è¡å·:{ tb2.Rows[i]["çäº§è®¢åæç»è¡å·"].ToString()},ç©æç¼ç :{ tb2.Rows[i]["ç©æç¼ç "].ToString()}";
			$",çäº§è®¢åæç»è¡å·:{ tb2.Rows[i]["çäº§è®¢åæç»è¡å·"].ToString()},ç©æç¼ç :{ tb2.Rows[i]["ç©æç¼ç "].ToString()}";
			}

			if (error.Length > 0)
			{
			@@ -126,6 +127,7 @@
			tb2.Rows[i]["HWorkShopID"] = ds.Tables[0].Rows[0]["HDeptID"].ToString();
			tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString();//çäº§è®¢åä¸»id
			tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//çäº§è®¢ååid
			tb2.Rows[i]["çäº§è®¢åæ°é"] = ds.Tables[0].Rows[0]["çäº§ä»»å¡åæ°é"].ToString();//çäº§è®¢åæ°é
			}

			ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList " +
			@@ -143,29 +145,72 @@
			tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HSourceID"].ToString();
			tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HEmpID"].ToString();
			tb2.Rows[i]["åå·¥ç¼ç "] = ds.Tables[0].Rows[0]["èåä»£ç "].ToString();
			tb2.Rows[i]["åå·¥"] = ds.Tables[0].Rows[0]["èå"].ToString();
			tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HUnitID"].ToString();
			tb2.Rows[i]["è®¡éåä½"] = ds.Tables[0].Rows[0]["è®¡éåä½"].ToString();
			tb2.Rows[i]["æ¹æ¬¡å·"] = ds.Tables[0].Rows[0]["æ¹æ¬¡"].ToString();
			tb2.Rows[i]["éå®è®¢åæ°é"] = ds.Tables[0].Rows[0]["éå®è®¢åæ°é"].ToString();
			tb2.Rows[i]["çäº§è®¢åæ°é"] = ds.Tables[0].Rows[0]["è®¢åéæ±æ°é"].ToString();
			tb2.Rows[i]["æ»é½å¥æ°é"] = ds.Tables[0].Rows[0]["é½å¥æ°é"].ToString();
			}
			else
			{
			//åå·¥
			ds = oCN.RunProcReturn($"select * from Gy_Employee where HNumber='{tb2.Rows[i]["åå·¥ç¼ç "].ToString()}'", "Gy_Employee");
			if (ds.Tables[0].Rows.Count > 0)
			tb2.Rows[i]["åå·¥ç¼ç "] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			if (ds.Tables[0].Rows.Count > 0) {
			tb2.Rows[i]["HEmpID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			tb2.Rows[i]["åå·¥"] = ds.Tables[0].Rows[0]["HName"].ToString();
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i + 1}è¡,åå·¥æ¥æ æ°æ®!";
			objJsonResult.data = tb2;
			return objJsonResult;
			}

			//è®¡éåä½
			ds = oCN.RunProcReturn($"select * from Gy_Unit where HNumber='{tb2.Rows[i]["è®¡éåä½"].ToString()}'", "Gy_Unit");
			if (ds.Tables[0].Rows.Count > 0)
			{
			tb2.Rows[i]["HUnitID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i + 1}è¡,è®¡éåä½æ¥æ æ°æ®!";
			objJsonResult.data = tb2;
			return objJsonResult;
			}

			//çäº§èµæº
			ds = oCN.RunProcReturn($"select * from Gy_Source where HNumber='{tb2.Rows[i]["çäº§èµæºç¼ç *"].ToString()}'", "Gy_Source");
			if (ds.Tables[0].Rows.Count > 0)
			{
			tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			else {
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i+1}è¡,çäº§èµæºæ¥æ æ°æ®!";
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			}
			//ç»ç»
			ds = oCN.RunProcReturn($"select * from Xt_ORGANIZATIONS where HNumber='{tb2.Rows[i]["ç»ç»ç¼ç *"].ToString()}'", "Xt_ORGANIZATIONS");
			if (ds.Tables[0].Rows.Count > 0)
			{
			tb2.Rows[i]["HProdORGID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"ç¬¬{i + 1}è¡,ç»ç»æ¥æ æ°æ®!";
			objJsonResult.data = tb2;
			return objJsonResult;
			}
			}

			@@ -260,6 +305,7 @@
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//è·å¾ä¸ä¸ªæ°çid
			var HICMOBillNo = list[i]["çäº§è®¢åå·*"].ToString();
			var HICMOEntrySEQ = list[i]["çäº§è®¢åæç»è¡å·*"].ToString();
			var HProdORGID = list[i]["HProdORGID"].ToString();
			var HWorkShopID = list[i]["HWorkShopID"].ToString();
			var HSourceID = list[i]["HSourceID"].ToString();
			var HYX = list[i]["ä¼åçº§"].ToString();
			@@ -270,7 +316,7 @@
			var HUnitID = list[i]["HUnitID"].ToString();
			var HBatchNo = list[i]["æ¹æ¬¡å·"].ToString();
			var HSeOrderBillQty = list[i]["éå®è®¢åæ°é"].ToString();
			var HOrderNeedQty = list[i]["çäº§è®¢åæ°é"].ToString();
			var HPlanQty = list[i]["çäº§è®¢åæ°é"].ToString();
			var HCompleteQty = list[i]["æ»é½å¥æ°é"].ToString();
			var HOrderType = omdelMian.HOrderType;
			var HDate = omdelMian.HDate;
			@@ -293,14 +339,14 @@
			"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
			"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
			" HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
			" HSeOrderBillQty, HOrderNeedQty, HCompleteQty,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID)values" +
			" HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
			"HMainSourceInterID,HMainSourceEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec)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)}, {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
			$" {HMainSourceInterID},{HMainSourceEntryID})");
			$" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
			$" {HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID})");
			}

			int SumDay = 31; //å¨æä¸¤æä¹å·® DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
			@@ -378,7 +424,7 @@
			if (count != 1)
			{
			//æå¥åè¡¨
			oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HEntryID," +
			oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
			"HMasterDate,HQty)" +
			$"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
			$" '{date}', {HQTY})");