From 315b12766c0ea48059c79c48bc57f0d40c65438d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 18 四月 2025 13:57:36 +0800
Subject: [PATCH] 工艺路线：导入功能(包含子表)
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 1397 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,358 insertions(+), 39 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 2e6f0ac..eb7a166 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1,19 +1,16 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
-using SQLHelper;
+using SyntacticSugar.constant;
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Data;
-using System.Data.SqlClient;
using System.IO;
using System.Web;
using System.Web.Http;
using System.Windows.Forms;
using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
-using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
//宸ヨ壓璺嚎Controller
@@ -29,6 +26,7 @@
public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
DAL.ClsGy_Warehouse_View oCenWare = new DAL.ClsGy_Warehouse_View();
+ DAL.ClsGy_Source_View oSourceHlp = new DAL.ClsGy_Source_View();
Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
public string BillType = "3301";
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
@@ -244,6 +242,21 @@
return objJsonResult;
}
}
+ else if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+ {
+ DataSet dss;
+ dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + HInterID, "Gy_RoutingBillMain");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚寮曠敤锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
if (OperationType == 2)
{
ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
@@ -255,12 +268,34 @@
objJsonResult.data = null;
return objJsonResult;
}
- }
+ }
ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
{
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCN.RunProcReturn("Exec h_p_Gy_RoutingBill_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", " h_p_Gy_RoutingBill_BeforeSaveCtrl ");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
//涓昏〃
oCN.RunProc("Insert Into Gy_RoutingBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
@@ -276,35 +311,78 @@
"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
",'" + HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "'," + HOrgID + ",'"+ HProcPriceType + "','" + HBeginDate + "','" + HEndDate + "') ");
+
+ //=========================淇濆瓨鍚庢帶鍒� 娣诲姞瀹℃壒娴�
+ //DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_RoutingBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "',1 ", "h_p_Gy_RoutingBill_AfterSaveCtrl");
+ //if (ds2 == null)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+
+ //}
+ //if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //============================
+
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ヨ壓璺嚎鍗曟嵁:" + HBillNo);
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板宸ヨ壓璺嚎鍗曟嵁锛�" + HBillNo + "','LMES-宸ヨ壓璺嚎妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
- //淇敼
- DataSet dss;
- dss = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Gy_RoutingBillMain");
- //鍒ゆ柇鏄惁鍙紪杈�
- if ((dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) || (dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "1" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "5" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "0"))
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+
+ }
+ else
+ {
+ //淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID + " and HBillNo='" + HBillNo + "'", "Gy_RoutingBillMain");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if ((dss.Tables[0].Rows[0]["HChecker"].ToString() != "" && dss.Tables[0].Rows[0]["HChecker"] != null) || (dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "1" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "0" && dss.Tables[0].Rows[0]["HBillStatus"].ToString() != "5"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佹湭鍦ㄥ垱寤猴紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCN.RunProcReturn("Exec h_p_Gy_RoutingBill_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',2 ", " h_p_Gy_RoutingBill_BeforeSaveCtrl ");
+ if (ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ゅ崟鎹姸鎬佹湭鍦ㄥ垱寤烘垨閫�鍥烇紝涓嶅厑璁镐慨鏀癸紒";
- objJsonResult.data = 1;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
return objJsonResult;
}
- dss = oCN.RunProcReturn("select COUNT(*) as number from Sc_ProcessExchangeBillMain where HRoutingBillID = " + HInterID, "Gy_RoutingBillMain");
- //鍒ゆ柇鏄惁鍙紪杈�
- if (dss.Tables[0].Rows[0]["number"].ToString() != "0")
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ゅ崟鎹凡缁忚寮曠敤锛屼笉鍏佽淇敼锛�";
- objJsonResult.data = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
return objJsonResult;
}
-
+ //=========================================================
+
+
oCN.RunProc("update Gy_RoutingBillMain set " +
"HDate='" + HDate +
"',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',hupdater='" + HMaker +
@@ -319,11 +397,38 @@
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "'");
+ //=========================淇濆瓨鍚庢帶鍒� 娣诲姞瀹℃壒娴�
+ //DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_RoutingBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "',2 ", "h_p_Gy_RoutingBill_AfterSaveCtrl");
+ //if (ds2 == null)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+
+ //}
+ //if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //============================
+
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ヨ壓璺嚎鍗曟嵁:" + HBillNo);
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ヨ壓璺嚎鍗曟嵁锛�" + HBillNo + "','LMES-宸ヨ壓璺嚎妯″潡','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+
+
+
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -370,14 +475,16 @@
}
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+ //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
+ if (HStandard)
+ {
+ //璁剧疆榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
+ }
+ }
- //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾�
- //if (HStandard)
- //{
- // //璁剧疆榛樿宸ヨ壓璺嚎
- // oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'");
- //}
-
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
@@ -429,7 +536,7 @@
foreach (Gy_RoutingBillSub oSub in DetailColl)
{
i++;
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧")
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
{
if (oSub.HWorkQty <= 0)
{
@@ -456,7 +563,7 @@
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HIsTime,HEstimate " +
- ",HWorkTimes_S,HSortProcFlag " +
+ ",HWorkTimes_S,HSortProcFlag,HSubStdEmpAvg_S" +
") values("
+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -469,7 +576,7 @@
",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HEstimate.ToString() +
- ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) +
+ ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + oSub.HSubStdEmpAvg_S +
") ");
//璁′环鏂瑰紡涓嶄负璁℃椂锛屽垯鎶婅鏃舵殏浼板瓧娈垫洿鏂颁负绌�
if (oSub.HIsTime == false)
@@ -499,7 +606,7 @@
",HTechnologyParameter,HPicNum,HProcCheckNote" +
",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
- ",HWorkTimes_S,HSortProcFlag,HSNCtrl,HQCFst,HQCProc,HQCPatrol,HMaterToSourceCtrl " +
+ ",HWorkTimes_S,HSortProcFlag,HSNCtrl,HQCFst,HQCProc,HQCPatrol,HMaterToSourceCtrl,HSubStdEmpAvg_S" +
") values("
+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -513,7 +620,7 @@
",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
- ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) + "," + Convert.ToString(oSub.HQCFst ? 1 : 0) + "," + Convert.ToString(oSub.HQCProc ? 1 : 0) + "," + Convert.ToString(oSub.HQCPatrol ? 1 : 0) + "," + Convert.ToString(oSub.HMaterToSourceCtrl ? 1 : 0) +
+ ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) + "," + Convert.ToString(oSub.HQCFst ? 1 : 0) + "," + Convert.ToString(oSub.HQCProc ? 1 : 0) + "," + Convert.ToString(oSub.HQCPatrol ? 1 : 0) + "," + Convert.ToString(oSub.HMaterToSourceCtrl ? 1 : 0) + "," + oSub.HSubStdEmpAvg_S +
") ");
//璁′环鏂瑰紡涓嶄负璁℃椂锛屽垯鎶婅鏃舵殏浼板瓧娈垫洿鏂颁负绌�
if (oSub.HIsTime == false)
@@ -529,8 +636,8 @@
}
}
- //淇濆瓨鍚庢帶鍒�========================================= 娣诲姞瀹℃壒娴�
- ds = oCN.RunProcReturn("exec h_p_Gy_RoutingBill_AfterSaveCtrl " + HInterID, "h_p_Gy_RoutingBill_AfterSaveCtrl");
+ ////淇濆瓨鍚庢帶鍒�========================================= 娣诲姞瀹℃壒娴�
+ ds = oCN.RunProcReturn("exec h_p_Gy_RoutingBill_AfterSaveCtrl " + HInterID + ",'',"+ OperationType, "h_p_Gy_RoutingBill_AfterSaveCtrl");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -548,7 +655,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- //=========================================================
+ ////=========================================================
}
objJsonResult.code = "1";
@@ -558,6 +665,107 @@
return objJsonResult;
}
+ //宸ヨ壓璺嚎瀛欒〃 鏂板
+ [Route("Gy_RoutingBillSub/AddWorkQty")]
+ [HttpPost]
+ public object AddWorkQty([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Gy_RoutingBillSub_WorkQty> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub_WorkQty>>(msg2);
+ int i = 0;
+
+ oCN.BeginTran();//寮�濮嬩簨鐗�
+
+ foreach (Gy_RoutingBillSub_WorkQty oSub in DetailColl)
+ {
+ i++;
+
+ if (i == 1)
+ {
+ //鍏堝垹闄ゅ巻鍙茬粦瀹氭暟鎹悗鍦ㄩ噸鏂颁繚瀛�
+ oCN.RunProc("delete from Gy_RoutingBillSub_WorkQty where HInterID = " + oSub.HInterID + " and HEntryID = " + oSub.HEntryID);
+ };
+
+ oCN.RunProc($"insert into Gy_RoutingBillSub_WorkQty" +
+ $"(HInterID,HEntryID,HEntrySubID,HSourceID,HWorkQty_Source,HEntryStdEmpQty,HEntryStdEmpAvg,HSortNum,HRemark)" +
+ $"values({oSub.HInterID},{oSub.HEntryID},{i},{oSub.HSourceID},{oSub.HWorkQty_Source},{oSub.HEntryStdEmpQty}" +
+ $",{oSub.HEntryStdEmpAvg},{oSub.HSortNum},'{oSub.HRemark}')");
+ }
+
+ oCN.Commit();//鎻愪氦浜嬬墿
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();//鍥炴粴浜嬬墿
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎瀛欒〃缂栬緫鑾峰彇鏁版嵁
+ [Route("Gy_RoutingBill/EditWorkQty")]
+ [HttpGet]
+ public object EditWorkQty(long HInterID,long HEntryID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn($"select * from h_v_Gy_RoutingBillSub_WorkQtyEdit where hmainid={HInterID} and hsubid={HEntryID} order by HEntrySubID asc", "h_v_Gy_RoutingBillSub_WorkQtyEdit");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region 涓存椂瀹氶鎶ヨ〃
@@ -650,7 +858,7 @@
try
{
- ds = oCN.RunProcReturn("select a.*,m.HProcPriceType,m.HBeginDate,m.HEndDate,s.HQCProc,s.HQCFst,s.HQCPatrol,s.HMaterToSourceCtrl from h_v_Gy_RoutingBillList as a,Gy_RoutingBillMain as m,Gy_RoutingBillSub as s where m.HInterID = hmainid and s.HInterID = hmainid and s.HEntryID = hsubid and hmainid =" + HInterID, "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select a.*,m.HProcPriceType,m.HBeginDate,m.HEndDate,s.HQCProc,s.HQCFst,s.HQCPatrol,s.HMaterToSourceCtrl from h_v_Gy_RoutingBill_Edit as a,Gy_RoutingBillMain as m,Gy_RoutingBillSub as s where m.HInterID = hmainid and s.HInterID = hmainid and s.HEntryID = hsubid and hmainid =" + HInterID, "h_v_Gy_RoutingBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -1205,6 +1413,598 @@
}
#endregion
+ #region 宸ヨ壓璺嚎_瀛欒〃 鏂囦欢涓婁紶
+ [Route("Gy_RoutingBill/Gy_RoutingBillimport_WorkQty")]
+ [HttpPost]
+ public object Gy_RoutingBillimport_WorkQty()
+ {
+ try
+ {
+ var WorkBookName = HttpContext.Current.Request["WorkBookName"];
+ DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
+ Int64 HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 2, WorkBookName);
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+ DataTable tb3 = new DataTable("dt3");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("浜у搧浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪骇鍝佷唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭搴忓彿"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忓簭鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍔犲伐鏁伴噺"))
+ error += "娌℃湁鎵惧埌銆愬姞宸ユ暟閲忋�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("宸ヤ綔涓績"))
+ // error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冦�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鏈亾寮�宸ヤ綑閲�"))
+ // error += "娌℃湁鎵惧埌銆愭湰閬撳紑宸ヤ綑閲忋�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鏈亾鍥哄畾寮�宸ュぉ鏁�"))
+ // error += "娌℃湁鎵惧埌銆愭湰閬撳浐瀹氬紑宸ュぉ鏁般�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鐝骇瀹氶"))
+ // error += "娌℃湁鎵惧埌銆愮彮浜у畾棰濄�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("宸ュ簭宸ヤ环"))
+ // error += "娌℃湁鎵惧埌銆愬伐搴忓伐浠枫�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("宸ヨ壓鍙傛暟"))
+ // error += "娌℃湁鎵惧埌銆愬伐鑹哄弬鏁般�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鍥剧焊缂栧彿"))
+ // error += "娌℃湁鎵惧埌銆愬浘绾哥紪鍙枫�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鏈伐搴忕‘璁よ褰�"))
+ // error += "娌℃湁鎵惧埌銆愭湰宸ュ簭纭璁板綍銆戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鍥惧彿鐗堟湰"))
+ // error += "娌℃湁鎵惧埌銆愬浘鍙风増鏈�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鎬昏鍥惧彿"))
+ // error += "娌℃湁鎵惧埌銆愭�昏鍥惧彿銆戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鏉愯川"))
+ // error += "娌℃湁鎵惧埌銆愭潗璐ㄣ�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鎴愬搧缂栧彿"))
+ // error += "娌℃湁鎵惧埌銆愭垚鍝佺紪鍙枫�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鐗堟湰"))
+ // error += "娌℃湁鎵惧埌銆愮増鏈�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("妯″叿缂栧彿"))
+ // error += "娌℃湁鎵惧埌銆愭ā鍏风紪鍙枫�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("绋嬪簭鍙�"))
+ // error += "娌℃湁鎵惧埌銆愮▼搴忓彿銆戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鑹巼"))
+ // error += "娌℃湁鎵惧埌銆愯壇鐜囥�戠殑鏍囬";
+
+ //if (!tb2.Columns.Contains("涓嶈壇鍝佷粨"))
+ // error += "娌℃湁鎵惧埌銆愪笉鑹搧浠撱�戠殑鏍囬";
+
+ //if (!tb2.Columns.Contains("鎶ュ簾鍝佷粨"))
+ // error += "娌℃湁鎵惧埌銆愭姤搴熷搧浠撱�戠殑鏍囬";
+
+ //if (!tb2.Columns.Contains("鑹搧浠�"))
+ // error += "娌℃湁鎵惧埌銆愯壇鍝佷粨銆戠殑鏍囬";
+
+ if (!tb2.Columns.Contains("鐢熶骇璧勬簮浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愪唬鐮併�戠殑鏍囬,";
+
+ //if (!tb2.Columns.Contains("鐢熶骇璧勬簮"))
+ // error += "娌℃湁鎵惧埌銆愮敓浜ц祫婧愩�戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鏁版嵁鏍￠獙
+ objJsonResult = (json)Checkdata_WorkQty(tb2);
+ if (objJsonResult.code == "0")
+ {
+ return objJsonResult;
+ }
+
+ //鍒犻櫎涓存椂琛ㄦ暟鎹�
+ oCN.RunProc("delete from diyipi_WorkQty");
+
+ //涓存椂琛ㄦ坊鍔犳暟鎹�
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ string sql_temp = "insert into diyipi_WorkQty(宸ヨ壓璺嚎浠ｇ爜,宸ヨ壓璺嚎鍚嶇О, 浜у搧浠ｇ爜,浜у搧鍚嶇О,宸ュ簭搴忓彿,宸ュ簭浠ｇ爜,宸ュ簭,宸ヤ綔涓績,鍔犲伐鏁伴噺" +
+ //", 鑹巼, 宸ュ簭宸ヤ环, 涓嶅悎鏍煎崟浠�, 鎶ュ簾鍗曚环, 鏈亾鍥哄畾寮�宸ュぉ鏁�, 鏈亾寮�宸ヤ綑閲�, 涓婇亾绛夊緟澶╂暟" +
+ //", 涓婇亾寰幆鍛ㄦ湡, 鑷姩杞Щ, 澶栧崗鏍囪, 渚涘簲鍟嗕唬鐮�, 渚涘簲鍟�, 宸ヨ壓鍙傛暟, 鍥剧焊缂栧彿" +
+ //", 鏈伐搴忕‘璁よ褰�, 澶囨敞, 鍥惧彿鐗堟湰, 鎬昏鍥惧彿, 鏉愯川, 鎴愬搧缂栧彿, 鐗堟湰" +
+ //", 妯″叿缂栧彿, 绋嬪簭鍙�, 鐝骇瀹氶, 鏃堕棿鍗曚綅,涓嶈壇鍝佷粨,鎶ュ簾鍝佷粨,鑹搧浠�" +
+ ",鐢熶骇璧勬簮浠ｇ爜,HOrgID" +
+ ") " +
+ " values(" +
+ "'" + tb2.Rows[i]["宸ヨ壓璺嚎浠ｇ爜"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["宸ヨ壓璺嚎鍚嶇О"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["浜у搧浠ｇ爜"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["浜у搧鍚嶇О"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["宸ュ簭搴忓彿"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["宸ュ簭浠ｇ爜"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["宸ュ簭"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["宸ヤ綔涓績"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鍔犲伐鏁伴噺"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鑹巼"].ToString() + "'" +
+ //",'" + (tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString() == "" ? "0" : tb2.Rows[i]["宸ュ簭宸ヤ环"].ToString()) + "'" +
+ //",'" + tb2.Rows[i]["涓嶅悎鏍煎崟浠�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鎶ュ簾鍗曚环"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鏈亾寮�宸ヤ綑閲�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["涓婇亾绛夊緟澶╂暟"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["涓婇亾寰幆鍛ㄦ湡"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鑷姩杞Щ"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["澶栧崗鏍囪"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["渚涘簲鍟�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["宸ヨ壓鍙傛暟"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鍥剧焊缂栧彿"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["澶囨敞"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鍥惧彿鐗堟湰"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鎬昏鍥惧彿"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鏉愯川"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鎴愬搧缂栧彿"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鐗堟湰"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["妯″叿缂栧彿"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["绋嬪簭鍙�"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鐝骇瀹氶"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鏃堕棿鍗曚綅"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["涓嶈壇鍝佷粨"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鎶ュ簾鍝佷粨"].ToString() + "'" +
+ //",'" + tb2.Rows[i]["鑹搧浠�"].ToString() + "'" +
+ ",'" + tb2.Rows[i]["鐢熶骇璧勬簮浠ｇ爜"].ToString() + "'" +
+ "," + HOrgID + "" +
+ ")";
+ oCN.RunProc(sql_temp);
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //鏁版嵁妫�楠�
+ private object Checkdata_WorkQty(DataTable dt)
+ {
+ bool b = false;
+ string sErrMsg = "";
+ string sMsg = "";
+ for (int i = 0; i <= dt.Rows.Count - 1; i++)
+ {
+ string sHNumber = "";
+ string sHNamePoc = "";
+ string sHNumberCen = "";
+ Single sWorkQty = 0;
+ Single sHPassRate = 0;
+ string sHNumberSource = "";
+
+ sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["浜у搧浠ｇ爜"].ToString());
+ sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭搴忓彿"].ToString());
+ sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭"].ToString());
+ sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["鍔犲伐鏁伴噺"].ToString());
+
+ //sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績"].ToString());
+ //sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["鑹巼"].ToString());
+
+ sHNumberSource = DBUtility.ClsPub.isStrNull(dt.Rows[i]["鐢熶骇璧勬簮浠ｇ爜"].ToString());
+
+ if (sHNumber != "")
+ {
+ //璁板綍妫�楠屾暟鎹殑鎵�鍦ㄨ
+ int index = i + 1;
+
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ sMsg = "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ //寰楀埌宸ュ簭鍐呯爜
+ if (!oProcHlp.GetInfoByName(sHNamePoc))
+ {
+ sMsg = "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ //鍔犲伐鏁伴噺涓嶈兘灏忎簬绛変簬闆�
+ if (sWorkQty < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛屽姞宸ユ暟閲忎笉鑳藉皬浜庣瓑浜庨浂锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ////鑹巼涓嶈兘灏忎簬绛変簬闆�
+ //if (sHPassRate <= 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + index + "琛岃壇鐜囦笉鑳藉皬浜庣瓑浜庨浂锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ ////瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ //if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ ////寰楀埌宸ヤ綔涓績鍐呯爜
+ //if (!oCenHlp.GetInfoByName(sHNumberCen))
+ //{
+ // sMsg = "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦�";
+ // if (sErrMsg.Contains(sMsg) == false)
+ // {
+ // sErrMsg = sErrMsg + "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦╘r\n";
+ // }
+ // b = true;
+ //}
+
+
+ //鎷嗗垎銆愮敓浜ц祫婧愪唬鐮併�戯紝骞堕�愪釜楠岃瘉
+ if (sHNumberSource != "")
+ {
+ char[] delimiter = new char[] { ',' };
+ string[] sHNumberSourceList = sHNumberSource.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);
+ for (int t = 0; t < sHNumberSourceList.Length; t++)
+ {
+ if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
+ {
+ sMsg = "[" + sHNumberSourceList[t] + "]鐢熶骇璧勬簮涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumberSourceList[t] + "]鐢熶骇璧勬簮涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+ }
+ }
+ }
+ }
+ if (b == true)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎_瀛欒〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_RoutingBill/Gy_RoutingBill_WorkQty_btnSave")]
+ [HttpPost]
+ public object Gy_RoutingBill_WorkQty_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+
+ //淇濆瓨涓昏〃
+ objJsonResult = RoutAddBillMain_WorkQty(msg1);
+
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json RoutAddBillMain_WorkQty(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //琛ㄥご瀛楁
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
+
+ string finalErrMsg = "";
+
+ //鑾峰彇瀵煎叆琛ㄤ腑鐨勬渶鏂版暟鎹�
+ DataSet dsMain = oCN.RunProcReturn("select distinct 浜у搧浠ｇ爜 from diyipi_WorkQty", "diyipi_WorkQty");
+ if (dsMain.Tables[0].Rows.Count > 0)
+ {
+ for(int i=0;i< dsMain.Tables[0].Rows.Count; i++)
+ {
+ string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[0]["浜у搧浠ｇ爜"]);
+ if (!oMaterHlp.GetInfoByNumber(HMaterNumber))
+ {
+ string sMsg = "鐗╂枡銆�" + HMaterNumber + "銆戜笉瀛樺湪锛�";
+ if (finalErrMsg.Contains(sMsg) == false)
+ {
+ finalErrMsg = finalErrMsg + "鐗╂枡銆�" + HMaterNumber + "銆戜笉瀛樺湪锛乗r\n";
+ }
+ continue;
+ }
+
+ //鑾峰彇璇ョ墿鏂欏鍏ョ殑鏁版嵁涓槸鍚﹀瓨鍦ㄥ涓伐鑹鸿矾绾匡紝濡傛灉瀛樺湪锛屽垯鎶ラ敊
+ string HBillNo = "";
+ Int64 HInterID = 0;
+ DataSet dsHBillNo = oCN.RunProcReturn("select distinct 宸ヨ壓璺嚎浠ｇ爜,宸ヨ壓璺嚎鍚嶇О from diyipi_WorkQty where 浜у搧浠ｇ爜 = '" + HMaterNumber + "'", "diyipi_WorkQty");
+ if (dsHBillNo.Tables[0].Rows.Count > 1)
+ {
+ string sMsg = "鐗╂枡銆�" + HMaterNumber + "銆戝瓨鍦ㄥ缁勩�愬伐鑹鸿矾绾夸唬鐮侊紝宸ヨ壓璺嚎鍚嶇О銆戯紒";
+ if (finalErrMsg.Contains(sMsg) == false)
+ {
+ finalErrMsg = finalErrMsg + "鐗╂枡銆�" + HMaterNumber + "銆戝瓨鍦ㄥ缁勩�愬伐鑹鸿矾绾夸唬鐮侊紝宸ヨ壓璺嚎鍚嶇О銆戯紒\r\n";
+ }
+ continue;
+ }
+ else //鐗╂枡瀵瑰簲宸ヨ壓璺嚎鍞竴锛岃幏鍙栧伐鑹鸿矾绾夸富鍐呯爜涓庡伐鑹鸿矾绾夸唬鐮�
+ {
+ //鐢熸垚鍞竴鐨勫伐鑹鸿矾绾夸唬鐮�
+ HBillNo = DBUtility.ClsPub.isStrNull(dsHBillNo.Tables[0].Rows[0]["宸ヨ壓璺嚎浠ｇ爜"]);
+ 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");
+ }
+ }
+
+ //鐢熸垚鍞竴鐨勫伐鑹鸿矾绾垮唴鐮�
+ if (HInterID == 0)
+ {
+ while (1 == 1)
+ {
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ DataSet dataSet = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
+ if (dataSet.Tables[0].Rows.Count == 0)
+ {
+ break;
+ }
+ }
+ }
+ }
+
+ //鎷兼帴涓昏〃鎻掑叆璇彞
+ string sqlMain = "insert into Gy_RoutingBillMain" +
+ "(HInterID,HYear,HPeriod,HBillType,HBillNo,HName,HDate,HMaker,HMakeDate,HRemark,HOrgID" +
+ ",HMaterID,HMaterNumber,HUnitID,HUnitNumber,HStandard,HRoutingGroupID) " +
+ "values(" +
+ "" + HInterID + "" +
+ "," + DateTime.Now.Year + "" +
+ "," + DateTime.Now.Month + "" +
+ ",'" + BillType + "'" +
+ ",'" + HBillNo + "'" +
+ ", ''" +
+ "," + "convert(varchar(100),getdate(),23)" + "" +
+ ",'" + user + "'" +
+ ", getdate()" +
+ ",'" + "鎵归噺瀵煎叆(鍖呭惈瀛欒〃)" + "'" +
+ "," + omdelMian.HOrgID +
+ "," + oMaterHlp.omodel.HItemID + "" +
+ ",'" + oMaterHlp.omodel.HNumber + "'" +
+ "," + oMaterHlp.omodel.HUnitID + "" +
+ ",'" + oMaterHlp.omodel.HUnitNumber + "'" +
+ "," + 1 + "" +
+ "," + 0 + "" +
+ ")";
+
+ //鑾峰彇璇ョ墿鏂欑殑宸ヨ壓璺嚎淇℃伅瀛愯〃鏁版嵁
+ DataSet dsSub = oCN.RunProcReturn("select * from diyipi_WorkQty where 浜у搧浠ｇ爜 = '" + HMaterNumber + "' order by 宸ュ簭搴忓彿", "diyipi_WorkQty");
+ for(int j = 0; j < dsSub.Tables[0].Rows.Count; j++)
+ {
+ string HProcNumber = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["宸ュ簭浠ｇ爜"]);
+ //寰楀埌宸ュ簭鍐呯爜
+ if (!oProcHlp.GetInfoByNumber(HProcNumber))
+ {
+ string sMsg = "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ if (finalErrMsg.Contains(sMsg) == false)
+ {
+ finalErrMsg = finalErrMsg + "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ }
+ continue;
+ }
+ else
+ {
+ string sqlSub = "insert into Gy_RoutingBillSub" +
+ "(HInterID,HEntryID,HProcNo,HProcID,HCenterID,HWorkQty,HSortProcFlag,HRemark,HTimeUnit,HReadyTime,HQueueTime,HMoveTime) " +
+ "values(" +
+ "" + HInterID + "" +
+ "," + (j + 1) + "" +
+ "," + DBUtility.ClsPub.isLong(dsSub.Tables[0].Rows[j]["宸ュ簭搴忓彿"]) +
+ "," + oProcHlp.omodel.HItemID + "" +
+ "," + 0 + "" +
+ "," + DBUtility.ClsPub.isDoule(dsSub.Tables[0].Rows[j]["鍔犲伐鏁伴噺"]) +
+ ",1" +
+ ",'鎵归噺瀵煎叆(鍖呮嫭瀛欒〃)'" +
+ ", 0" +
+ ", 0" +
+ ", 0" +
+ ", 0" +
+ ")";
+
+ char[] delimiter = new char[] { ',' };
+ string HSourceNumberList = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["鐢熶骇璧勬簮浠ｇ爜"]);
+ string[] sHNumberSourceList = HSourceNumberList.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);
+ for(int t = 0; t < sHNumberSourceList.Length; t++)
+ {
+ //寰楀埌鐢熶骇璧勬簮鍐呯爜
+ if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
+ {
+ string sMsg = "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ if (finalErrMsg.Contains(sMsg) == false)
+ {
+ finalErrMsg = finalErrMsg + "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ }
+ continue;
+ }
+ else
+ {
+ string sqlSub_WorkQty = "insert into Gy_RoutingBillSub_WorkQty" +
+ "(HInterID,HEntryID,HEntrySubID,HRemark,HSourceID) " +
+ "values(" +
+ "" + HInterID + "" +
+ "," + (j+1) + "" +
+ "," + (t+1) + "" +
+ ", '鎵归噺瀵煎叆(鍖呮嫭瀛欒〃)'" +
+ "," + oSourceHlp.omodel.HItemID + "" +
+ ")";
+
+ oCN.RunProc(sqlSub_WorkQty);
+ }
+ }
+ oCN.RunProc(sqlSub);
+ }
+ }
+ oCN.RunProc(sqlMain);
+ oCN.RunProc("update Gy_RoutingBillMain set HStandard = 0 where HMaterID = " + oMaterHlp.omodel.HItemID + " and HInterID <>" + HInterID);
+ }
+ }
+
+ if (finalErrMsg.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = finalErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("delete from diyipi_WorkQty");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆瀹屾垚,鍏�" + dsMain.Tables[0].Rows.Count + "涓伐鑹鸿矾绾�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ヨ壓璺嚎 瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
@@ -1212,7 +2012,7 @@
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>
+ /// <returns></returns>Gy_RoutingBill/CheckGy_RoutingBill
[Route("Gy_RoutingBill/AuditGy_RoutingBill")]
[HttpGet]
public object AuditGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
@@ -1268,7 +2068,60 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_RoutingBill_BeforeCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'";
+ var ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_RoutingBill_BeforeCheckCtrl");
+ if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds2.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds2.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //瀹℃牳宸ヨ壓璺嚎
oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_RoutingBill_AfterCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_RoutingBill_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
//鑾峰彇绯荤粺鍙傛暟
string Ret = "";
@@ -1289,8 +2142,58 @@
}
if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_Routing_BeforeUnCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'";
+ var ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_Routing_BeforeUnCheckCtrl");
+ if (ds2 == null || ds2.Tables.Count == 0 || ds2.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds2.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds2.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ //鍙嶅鏍稿伐鑹鸿矾绾�
oCN.RunProc("update Gy_RoutingBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_RoutingBill_AfterUnCheckCtrl " + HInterID + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_RoutingBill_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍙嶅鏍告垚鍔�";
@@ -1339,6 +2242,16 @@
var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (IsAudit == 0) //鍏抽棴鍒ゆ柇
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
@@ -1406,6 +2319,194 @@
}
}
#endregion
+
+ #region 宸ヨ壓璺嚎 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+ /// <param name="CurUserName">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Gy_RoutingBill/DeleteGy_RoutingBill")]
+ [HttpGet]
+ public object DeleteOA_AndengFlowRuleBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Gy_RoutingBill_Delete";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //妫�鏌ユ潈闄�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_RoutingBill oBill = new DAL.ClsGy_RoutingBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 1) //浣滃簾鍒ゆ柇
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 2) //鍙嶄綔搴熷垽鏂�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+ if (IsAudit == 1) //浣滃簾鎻愪氦
+ {
+ //浣滃簾鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_RoutingBill_BeforeDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_RoutingBill_BeforeDropCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ //浣滃簾鎻愪氦
+ if (oBill.Cancelltion(lngBillKey, oBill.omodel.HBillNo, "h_p_Gy_RoutingBill_AfterDropCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 2) //鍙嶄綔搴熸彁浜�
+ {
+ //鍙嶄綔搴熷墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_RoutingBill_BeforeUnDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_RoutingBill_BeforeUnDropCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:鍙嶄綔搴熷墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ //鍙嶅叧闂彁浜�
+ if (oBill.AbandonCancelltion(lngBillKey, oBill.omodel.HBillNo, "h_p_Gy_RoutingBill_AfterUnDropCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ヨ壓璺嚎鍒楄〃 涓昏〃
/// <summary>
@@ -1567,7 +2668,7 @@
" LEFT JOIN Gy_RoutingBillMain as po ON a.hmainid = po.HInterID" +
" LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
" LEFT JOIN Xt_CheckUserRight as cr ON cr.HCheckItemID = i.HItemID and cr.HCheckFlowInterID = m.HInterID" +
- " where po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID and cr.HUserID = '" + userid + "'";
+ " where 宸ュ簭浠ｇ爜 != '9999' and a.HBillSubType<>'SUB' and po.HBillStatus = 6 and po.HCheckItemNowID = i.HItemID and cr.HUserID = '" + userid + "'";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -1614,10 +2715,11 @@
return objJsonResult;
}
//鎼滅储闇�瑕佸鏍哥殑
- string sql = " select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
+ string sql = "select TOP 1000 a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
" LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
" LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
- " where c.HCheckDate is not NUll and c.HChecker = '" + user + "'";
+ " where 宸ュ簭浠ｇ爜 != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is not NUll and c.HChecker = '" + user + "'"+
+ " ORDER BY a.hmainid DESC;";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -2037,6 +3139,17 @@
objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧") //绯荤粺鍙傛暟
+ {
+ //鍒锋柊榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + CurUserName + "'");
+ }
+ }
}
else
{
@@ -2292,7 +3405,7 @@
return objJsonResult;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 澶辨晥鏃堕棿 BETWEEN NOW() - INTERVAL 15 DAY AND NOW() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 鐘舵��!= '鍏抽棴' and 澶辨晥鏃堕棿 BETWEEN CAST(GETDATE() AS DATE) AND DATEADD(DAY, 15, GETDATE()) " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
@@ -2320,5 +3433,211 @@
}
#endregion
+
+ #region 宸ヨ壓璺嚎(闆嗕綋) 鎵归噺澶氱骇瀹℃牳
+ [Route("Gy_Routing/CheckAllFlow")]
+ [HttpGet]
+ public object CheckAll(string HInterIDS, int IsAudit, string CurUserName, string CurUserID)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(HInterIDS))
+ {
+ int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
+ // 澶勭悊idArray...
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)AuditGy_Routing_Flow(idArray[i], IsAudit, CurUserName, CurUserID);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ壓璺嚎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鎵归噺椹冲洖
+ [Route("Gy_Routing/RejectAllCheckFlow")]
+ [HttpGet]
+ public object RejectAllCheckFlow(string HInterIDS,string CurUserID)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(HInterIDS))
+ {
+ int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
+ // 澶勭悊idArray...
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)RejectCheckFlow(idArray[i].ToString(),CurUserID);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "椹冲洖宸ヨ壓璺嚎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎鎾ゅ洖
+ [Route("Gy_Routing/WithdrawCheckFlow")]
+ [HttpGet]
+ public object WithdrawCheckFlow(string HInterID, string user)
+ {
+ try
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_RoutingBill oBill = new DAL.ClsGy_RoutingBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ヨ壓璺嚎鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "N") //绯荤粺鍙傛暟 鏈惎鐢ㄨ嚜鍔ㄥ鏍�
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏈惎鐢ㄥ绾у鎵圭鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HBillStatus != 6)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳芥挙鍥�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愭挙鍥�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
+ string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "' and ISNULL(HChecker,'') <> ''";
+ DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ {
+ oCN.BeginTran();
+ //鑾峰彇闇�瑕侀┏鍥炵殑瀹℃牳椤圭洰
+ string sql1 = "select c.* from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
+ "where c.HBillTypeID = '" + this.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds1= oCN.RunProcReturn(sql1, "Xt_BillCheckFlowStatus");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鎾ゅ洖澶辫触!鍘熷洜:鏈彂璧峰鎵癸紒锛�";
+ return false;
+ }
+ //鑾峰彇褰撳墠瀹℃牳椤圭洰
+ string HCheckFlowID = ds1.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //瀹℃壒娴佸唴鐮�
+ sql0 = "select * from Gy_RoutingBillMain " + " where HInterID = " + lngBillKey;
+ ds0 = oCN.RunProcReturn(sql0, "Gy_RoutingBillMain");
+ string HCheckItemNowID = ds0.Tables[0].Rows[0]["HCheckItemNowID"].ToString(); //褰撳墠瀹℃壒椤圭洰鍐呯爜
+ //鏇存柊 椹冲洖鍒犻櫎瀹℃牳娴佺姸鎬佽〃
+ string sql02 = "Delete Xt_BillCheckFlowStatus where HBillTypeID = '" + this.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID;
+ oCN.RunProc(sql02);
+ oCN.RunProc(" Update Gy_RoutingBillMain" + " set HChecker='',HCheckDate=null,HBillStatus=1,HCheckItemNowID = 0,HCheckItemNextID = 0 Where HInterID=" + lngBillKey.ToString());
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎾ゅ洖鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎾ゅ洖澶辫触!鍘熷洜:鍗曟嵁瀛樺湪宸茬粡瀹℃牳鐨勯」鐩紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1