From 9c2cf57d942f23a371bf1d47961d1d32a11f5f1e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 26 七月 2022 10:08:19 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 335 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 194 insertions(+), 141 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 0deda31..781a0a4 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -19,7 +19,7 @@
private json objJsonResult = new json();
-
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
@@ -136,7 +136,7 @@
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
-
+
}
catch (Exception e)
{
@@ -216,14 +216,21 @@
DataRow dr1 = ds1.Tables[0].Rows[0];
JObject model = new JObject();
- model.Add("FBillType", "50fa7c2eda7947b89fab5431bf25d48e"); //鍗曟嵁绫诲瀷1
+ model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
JArray Fentity = new JArray();
foreach (DataRow item in ds.Tables[0].Rows)
{
JObject FentityModel = new JObject();
- FentityModel.Add("FReportType", "103852");//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = "1" });//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
+ FentityModel.Add("FProductType", "1");// 浜у搧绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
+ FentityModel.Add("FSrcInterId", dr1["FMOID"].ToString());// 婧愬崟鍐呯爜
+ FentityModel.Add("FSrcEntryId", dr1["FMOENTRYID"].ToString());// 婧愬崟鍒嗗綍鍐呯爜銆�
+ FentityModel.Add("FSRCENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// 婧愬崟鍒嗗綍琛屽彿
+ FentityModel.Add("FUNITID", new JObject() { ["Fnumber"] = dr1["FUNITNUMBER"].ToString() });//鍗曚綅
FentityModel.Add("FTimeUnitId", "1");//鏃堕棿鍗曚綅
FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // 鐢熶骇杞﹂棿
FentityModel.Add("FStandHourUnitId", "3600"); // 鍗曚綅鏍囧噯宸ユ椂鍗曚綅
@@ -231,25 +238,48 @@
FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//鐢熶骇璁㈠崟琛屽彿
FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
- FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1
- FentityModel.Add("FStockInOrgId ", OrganizationNUM);// 鍏ュ簱缁勭粐
+ FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
+ FentityModel.Add("FFailQty", item["涓嶈壇鏁伴噺"].ToString());//涓嶅悎鏍兼暟閲�
+ FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 鍏ュ簱缁勭粐
FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
- FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
- FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
- FentityModel.Add("FSrcInterId", dr1["HICMOInterID"].ToString());// 婧愬崟鍐呯爜
- FentityModel.Add("FSrcEntryId", dr1["HICMOEntryID"].ToString());// 婧愬崟鍒嗗綍鍐呯爜
+ FentityModel.Add("FMOID", dr1["FMOID"].ToString());//
+ FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());//
+ FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
+ FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());//
+ FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
+ FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
+ FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
+ FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
+ //FFLOWID FFLOWLINEID FRULEID FSTABLENAME
+ //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
+ //涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
+ //鎺ㄨ繘璺嚎锛欶Entity_Link_FFlowLineId
+ //杞崲瑙勫垯锛欶Entity_Link_FRuleId
+ //婧愬崟琛ㄥ唴鐮侊細FEntity_Link_FSTableId
+ //婧愬崟琛細FEntity_Link_FSTableName
+ //婧愬崟鍐呯爜锛欶Entity_Link_FSBillId
+ //婧愬崟鍒嗗綍鍐呯爜锛欶Entity_Link_FSId
+ //鍘熷鎼哄甫閲忥細FEntity_Link_FBaseQuaQtyOld
+ //淇敼鎼哄甫閲忥細FEntity_Link_FBaseQuaQty
- //JArray Fentity2 = new JArray();
- //JObject FentityModel2 = new JObject();
- //FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
- //FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
- //FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
- //FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
- //Fentity2.Add(FentityModel2);
- //FentityModel.Add("FDetailEntity_Link", Fentity2);
- //Fentity.Add(FentityModel);
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
+ FentityModel2.Add("FEntity_Link_FFlowLineId", "PRD_MO2MORPT");
+ FentityModel2.Add("FEntity_Link_FRuleId", "3");
+ FentityModel2.Add("FEntity_Link_FSTableId", "0");
+ FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MOENTRY");
+ FentityModel2.Add("FEntity_Link_FSBillId", dr1["FMOID"].ToString());
+ FentityModel2.Add("FEntity_Link_FSId", dr1["FMOENTRYID"].ToString());
+ FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["鍚堟牸鏁伴噺"].ToString());
+ FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["鍚堟牸鏁伴噺"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FEntity_Link", Fentity2);
+ FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
+ Fentity.Add(FentityModel);
}
- model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+ model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
JObject jsonRoot = new JObject()
{
["Creator"] = "",
@@ -261,14 +291,36 @@
//["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
["Model"] = model
};
- string result = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));
- //鍒ゆ柇瀹℃牳鏄惁鎴愬姛
+ LogService.Write("jsonRoot:" + jsonRoot);
+ string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
+
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = $"宸ュ簭姹囨姤鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{dr["鍗曟嵁鍙�"].ToString()}" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦瀹℃牳
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ var json = new
+ {
+ Ids = fID,
+ };
+ result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
+ //result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//瀹℃牳
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
objJsonResult.data = null;
return objJsonResult;
}
@@ -298,7 +350,7 @@
/// </summary>
[Route("Sc_ProcessMangement/MES_Sc_ProcessReportList_Json")]
[HttpGet]
- public object MES_Sc_ProcessReportList_Json(string sWhere,string user)
+ public object MES_Sc_ProcessReportList_Json(string sWhere, string user)
{
DataSet ds;
try
@@ -321,7 +373,7 @@
else
{
string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc";
+ string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList");
}
}
@@ -349,11 +401,11 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (HInterID<=0)
+ if (HInterID <= 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID灏忎簬0锛�" ;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -366,9 +418,9 @@
inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;
ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
-
+
}
-
+
}
catch (Exception e)
{
@@ -405,12 +457,12 @@
else
{
- string sql1 =@"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠ｇ爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠ｇ爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁￠噺鍗曚綅浠ｇ爜], [璁￠噺鍗曚綅], [HprocID],
+ string sql1 = @"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠ｇ爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠ｇ爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁￠噺鍗曚綅浠ｇ爜], [璁￠噺鍗曚綅], [HprocID],
[宸ュ簭浠ｇ爜], [宸ュ簭], [HGroupID], [鐝粍浠ｇ爜], [鐝粍鍚嶇О], [HSourceID], [璧勬簮浠ｇ爜], [鐢熶骇璧勬簮], [HWorkerID], [鑱屽憳浠ｇ爜], [鑱屽憳], [hsubid], [鏁伴噺], [璁″垝寮�宸ユ棩鏈焆,
[璁″垝瀹屽伐鏃ユ湡], [璁″垝宸ユ椂], [琛ㄤ綋澶囨敞], [HICMOInterID], [鐢熶骇浠诲姟鍗曞彿], [HSeOrderInterID], [閿�鍞鍗曞彿], [琛ㄥご澶囨敞], [鍒跺崟浜篯, [鍒跺崟鏃ユ湡], [瀹℃牳浜篯, [瀹℃牳鏃ユ湡], [淇敼浜篯,
[淇敼鏃ユ湡], [鍏抽棴浜篯, [鍏抽棴鏃ユ湡], [浣滃簾浜篯, [浣滃簾鏃ユ湡], [婧愬崟涓诲唴鐮乚, [婧愬崟瀛愬唴鐮乚, [婧愬崟鍗曞彿], [婧愬崟绫诲瀷], [琛屽叧闂汉], [HBillType], [HQtyDecimal], [HPriceDecimal]
from h_v_Sc_ProcessSendWorkList
-where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")";
+where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID=" + HInterID + ")";
ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList");
@@ -440,7 +492,7 @@
/// </summary>
[Route("Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json")]
[HttpGet]
- public object MES_Sc_ProcessPlanMain_Json(string sWhere,string user)
+ public object MES_Sc_ProcessPlanMain_Json(string sWhere, string user)
{
DataSet ds;
try
@@ -462,7 +514,7 @@
else
{
string sql1 = "select * from h_v_Sc_ProcessPlanList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
}
}
@@ -542,7 +594,7 @@
",HRemark,HInnerBillNo,HMaker,HMakeDate" +
") " +
" values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() +
- ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + (omodel.HBillStatus=1) + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
+ ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + (omodel.HBillStatus = 1) + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() +
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() +
",'" + omodel.HUnitNumber + "'," + omodel.HPlanQty.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HExplanation + "'" +
",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + omodel.HMaker + "',getdate()" +
@@ -577,7 +629,7 @@
" where HInterID=" + omodel.HInterID.ToString());
//鍒犻櫎瀛愯〃
- oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString()+ " and hentryid="+ hentryid);
+ oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString() + " and hentryid=" + hentryid);
}
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub(msg3, hentryid);
@@ -624,7 +676,7 @@
",HBeginDayQty,HBeginFixQty,HFixWorkDays,HTrunWorkDays,HReadyTimes" +
",HReadyTime,HQueueTime,HMoveTime,HBatchNo" +
") values("
- + omodel.HInterID.ToString() + "," +(hentryid==-1?i: hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
+ + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() +
",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" +
"," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
"," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate.ToString() + "','" + oSub.HPlanEndDate.ToString() + "'" +
@@ -733,7 +785,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:"+DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -749,7 +801,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- else {
+ else
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "瀹℃牳澶辫触,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -787,7 +840,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
}
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
@@ -854,7 +907,7 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
@@ -892,7 +945,7 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json")]
[HttpGet]
- public object MES_Sc_ProcessSendWorkMain_Json(string sWhere,string user)
+ public object MES_Sc_ProcessSendWorkMain_Json(string sWhere, string user)
{
DataSet ds;
try
@@ -915,7 +968,7 @@
else
{
string sql1 = "select * from h_v_Sc_ProcessSendWorkList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessSendWorkList");
}
}
@@ -937,7 +990,7 @@
/// <returns></returns>
[Route("SaveProcessSendWork")]
[HttpPost]
- public object SaveProcessSendWork([FromBody]JObject msg)
+ public object SaveProcessSendWork([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -967,7 +1020,7 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", "");
lsmain = oListModels.getObjectByJson_SendWorkMain(msg2);
- foreach ( Model.ClsSc_ProcessSendWorkMain oItem in lsmain)
+ foreach (Model.ClsSc_ProcessSendWorkMain oItem in lsmain)
{
UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -1034,7 +1087,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (Convert.ToInt32( sendworksub.HQty) > Convert.ToInt32( oItemSub.璁″垝鏁伴噺))
+ if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.璁″垝鏁伴噺))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1058,7 +1111,7 @@
sendworksub.HCloseType = false;
sendworksub.HSourceBillType = oItemSub.HBillType;
lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
-
+
}
if (lss.Count > 0)
@@ -1208,7 +1261,7 @@
sendworksub.HWorkerNumber = ""; //--鎿嶄綔宸ヤ唬鐮�
sendworksub.HWorkerID = 0; //--鎿嶄綔宸D
sendworksub.HGroupNumber = ""; //鐝粍浠ｇ爜
- sendworksub.HGroupID =0; //--鐝粍ID
+ sendworksub.HGroupID = 0; //--鐝粍ID
sendworksub.HSourceNumber = ""; //--鐢熶骇璧勬簮浠ｇ爜
//--鐢熶骇璧勬簮ID
sendworksub.HProcNumber = ""; //--宸ュ簭浠ｇ爜
@@ -1346,7 +1399,7 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")]
[HttpGet]
- public object MES_QC_NoPassProdCheckBill_Json(string sWhere,string user)
+ public object MES_QC_NoPassProdCheckBill_Json(string sWhere, string user)
{
DataSet ds;
try
@@ -1369,7 +1422,7 @@
else
{
string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
}
}
@@ -1432,7 +1485,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎澶辫触!"+e.ToString();
+ objJsonResult.Message = "鍒犻櫎澶辫触!" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
@@ -1569,7 +1622,7 @@
/// <returns></returns>
[Route("SaveProcessReport")]
[HttpPost]
- public object SaveProcessReport([FromBody] JObject msg)
+ public object SaveProcessReport([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -1580,7 +1633,7 @@
List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
ls = oListModels.getObjectByJson_Report(msg1);
int i = 0;
-
+
foreach (Models.Sc_ProcessReportViewModel ItemView in ls)
{
i++;
@@ -1589,23 +1642,23 @@
//宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
ReportMain.HBillType = "3714";
ReportMain.HBillNo = ItemView.HBillNo;
- ReportMain.HMakeDate=DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- ReportMain.HYear=DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
ReportMain.HDate = DateTime.Now;
ReportMain.HMaker = ItemView.HEmp;
ReportMain.HCloseType = false;
ReportMain.HPlanQty = (double)ItemView.HQty;
ReportMain.HMainSourceInterID = ItemView.HInterID;
- ReportMain.HInterID =0;
+ ReportMain.HInterID = 0;
ReportMain.HPeriod = 1;
ReportMain.HBillSubType = "3714";
ReportMain.HBillStatus = 0;
ReportMain.HCheckItemNowID = 0;
ReportMain.HCheckItemNextID = 0;
- ReportMain.HICMOInterID= (long)ItemView.HICMOInterID;
- ReportMain.HICMOBillNo=ItemView.HICMOBillNo;
+ ReportMain.HICMOInterID = (long)ItemView.HICMOInterID;
+ ReportMain.HICMOBillNo = ItemView.HICMOBillNo;
ReportMain.HDeptID = (long)ItemView.HDeptID;
- ReportMain.HDeptNumber =ItemView.HDeptNumber;
+ ReportMain.HDeptNumber = ItemView.HDeptNumber;
ReportMain.HGroupID = (long)ItemView.HGroupID;
ReportMain.HGroupNumber = ItemView.HGroupNumber;
ReportMain.HMaterID = (long)ItemView.HMaterID;
@@ -1617,7 +1670,7 @@
ReportMain.HExplanation = "";
ReportMain.HInnerBillNo = "";
ReportMain.HSupID = 0;
-
+
//淇濆瓨鍒版眹鎶ュ崟涓昏〃
@@ -1636,15 +1689,15 @@
ReportSub.HQty = (double)ItemView.HQty;
ReportSub.HProcID = ItemView.HProcID;
ReportSub.HProcNumber = ItemView.HProcNumber;
- ReportSub.HOutPrice =0;
+ ReportSub.HOutPrice = 0;
ReportSub.HOutMoney = 0;
ReportSub.HSourceID = (long)ItemView.HSourceID;
ReportSub.HEmpNumber = "";
ReportSub.HRelBeginDate = DateTime.Now;
ReportSub.HRelEndDate = DateTime.Now;
- ReportSub.HTimes =3;
+ ReportSub.HTimes = 3;
ReportSub.HSeOrderInterID = 0;
- ReportSub.HSeOrderEntryID =0;
+ ReportSub.HSeOrderEntryID = 0;
ReportSub.HSeOrderBillNo = "";
ReportSub.HProcPlanInterID = 0;
ReportSub.HProcPlanBillNo = "";
@@ -1654,44 +1707,44 @@
ReportSub.HRelationMoney = 0;
ReportSub.HMaterID = (long)ItemView.HMaterID;
ReportSub.HMaterNumber = ItemView.HMaterNumber;
- ReportSub.HCheckQty =0;
- ReportSub.HBadCount =0;
- ReportSub.HWasterQty =0;
- ReportSub.HWasterQty2 =0;
- ReportSub.HPrice =0;
- ReportSub.HMoney =0;
- ReportSub.HProcPlanInterID =0;
- ReportSub.HProcPlanEntryID =0;
- ReportSub.HProcPlanBillNo ="";
- ReportSub.HSourceEntryID =0;
- ReportSub.HSourceBillType ="";
- ReportSub.HRelationQty =0;
- ReportSub.HRelationMoney =0;
- ReportSub.HBadPrirce =0;
- ReportSub.HBadMoney =0;
- ReportSub.HWasterPrice =0;
- ReportSub.HWasterMoney =0;
- ReportSub.HQualityRate =0;
- ReportSub.HSecUnitQty1 =0;
- ReportSub.HSecUnitRate1=0;
- ReportSub.HSecUnitQty2=0;
- ReportSub.HSecUnitRate2=0;
- ReportSub.HUsingQty=0;
- ReportSub.HSelfBadCount=0;
- ReportSub.HPreBadCount=0;
- ReportSub.HPayMentQty=0;
- ReportSub.HOtherDeduct=0;
- ReportSub.HRelPay=0;
- ReportSub.HOtherItem1="";
- ReportSub.HOtherItem2="";
- ReportSub.HOtherItem3="";
- ReportSub.HOtherItem4="";
- ReportSub.HOtherItem5="";
- ReportSub.HPackType="";
- ReportSub.HCheckEmpID=0;
- ReportSub.HWeight=0;
- ReportSub.HBatchNo="";
-
+ ReportSub.HCheckQty = 0;
+ ReportSub.HBadCount = 0;
+ ReportSub.HWasterQty = 0;
+ ReportSub.HWasterQty2 = 0;
+ ReportSub.HPrice = 0;
+ ReportSub.HMoney = 0;
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanEntryID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceEntryID = 0;
+ ReportSub.HSourceBillType = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HBadPrirce = 0;
+ ReportSub.HBadMoney = 0;
+ ReportSub.HWasterPrice = 0;
+ ReportSub.HWasterMoney = 0;
+ ReportSub.HQualityRate = 0;
+ ReportSub.HSecUnitQty1 = 0;
+ ReportSub.HSecUnitRate1 = 0;
+ ReportSub.HSecUnitQty2 = 0;
+ ReportSub.HSecUnitRate2 = 0;
+ ReportSub.HUsingQty = 0;
+ ReportSub.HSelfBadCount = 0;
+ ReportSub.HPreBadCount = 0;
+ ReportSub.HPayMentQty = 0;
+ ReportSub.HOtherDeduct = 0;
+ ReportSub.HRelPay = 0;
+ ReportSub.HOtherItem1 = "";
+ ReportSub.HOtherItem2 = "";
+ ReportSub.HOtherItem3 = "";
+ ReportSub.HOtherItem4 = "";
+ ReportSub.HOtherItem5 = "";
+ ReportSub.HPackType = "";
+ ReportSub.HCheckEmpID = 0;
+ ReportSub.HWeight = 0;
+ ReportSub.HBatchNo = "";
+
//淇濆瓨鍒版眹鎶ュ崟瀛愯〃
ReportModel.DetailColl.Add(ReportSub);
}
@@ -1767,7 +1820,7 @@
/// <returns></returns>
[Route("SaveProcessReportList")]
[HttpPost]
- public object SaveProcessReportList([FromBody] JObject msg)
+ public object SaveProcessReportList([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -1830,7 +1883,7 @@
List<Model.ClsSc_ProcessReportSub> lsReportSub = new List<Model.ClsSc_ProcessReportSub>();
foreach (WebAPI.Models.Sc_ProcessSendWorkViewModel ItemView in ls)
{
-
+
i++;
Model.ClsSc_ProcessReportSub reportSub = new Model.ClsSc_ProcessReportSub();
if (ItemView.鏁伴噺 <= 0)
@@ -1856,8 +1909,8 @@
reportSub.HRemark = "";
reportSub.HCloseMan = ReportModel.omodel.HCloseMan;
reportSub.HCloseType = false;
- reportSub.HEmpID =0;
- reportSub.HICMOBillNo ="";
+ reportSub.HEmpID = 0;
+ reportSub.HICMOBillNo = "";
reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
reportSub.HRemark = "";
reportSub.HSourceBillType = "3712";
@@ -1923,7 +1976,7 @@
lsReportSub.Add(reportSub);
}
- if (lsReportSub.Count>0)
+ if (lsReportSub.Count > 0)
{
//鐒跺悗鍦ㄥ惊鐜繚瀛樺埌姹囨姤浣嗗瓙琛�
foreach (Model.ClsSc_ProcessReportSub item in lsReportSub)
@@ -1992,7 +2045,7 @@
/// <returns></returns>
[Route("SaveBadReasonList")]
[HttpPost]
- public object SaveBadReasonList([FromBody] JObject msg)
+ public object SaveBadReasonList([FromBody] JObject msg)
{
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
@@ -2002,7 +2055,7 @@
string user = sArray[2].ToString();
- string UserName="";
+ string UserName = "";
ListModels oListModels = new ListModels();
try
{
@@ -2024,7 +2077,7 @@
foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain)
{
//oItem.HMaker = "";
- UserName=oItem.HMaker;
+ UserName = oItem.HMaker;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -2032,7 +2085,7 @@
oItem.HBillSubType = "7509";
oItem.HBillStatus = 1;
oItem.HPeriod = 0;
- oItem.HGroupName ="";
+ oItem.HGroupName = "";
oItem.HSourceID = 0;
oItem.HICMOInterID = 0;
oItem.HICMOBillNo = "";
@@ -2052,7 +2105,7 @@
oItem.HMainSourceInterID = oItem.HInterID;
oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- if (DBUtility.ClsPub.isStrNull(oItem.HDate)=="")
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2061,7 +2114,7 @@
return objJsonResult;
}
oBill.omodel = oItem;
- }
+ }
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
@@ -2079,8 +2132,8 @@
break;
}
//灏嗗墠鍙颁复鏃跺瓨鏀剧殑鍊间紶杩囨潵鐨勫�艰祴缁欏搴旂殑涓嶈壇鏁伴噺瀛楁
- oItemSub.HBadQty = Convert.ToDecimal( oItemSub.HMRBChecker);
- if (oItemSub.HBadQty<=0)
+ oItemSub.HBadQty = Convert.ToDecimal(oItemSub.HMRBChecker);
+ if (oItemSub.HBadQty <= 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2088,7 +2141,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty )
+ if ((double)oItemSub.HBadQty > oBill.omodel.HPlanQty)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2096,7 +2149,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="")
+ if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName) == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2123,7 +2176,7 @@
oItemSub.HBadPCSQty = 0;
oItemSub.HQCResultID = 0;
oBill.DetailColl.Add(oItemSub);
-
+
}
//淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰)
//淇濆瓨
@@ -2176,10 +2229,10 @@
/// <returns></returns>
[Route("CloseProcessReportList")]
[HttpGet]
- public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
+ public object CloseProcessReportList(int HInterID, int IsClose, string CurUserName)
{
DataSet ds;
- string ModRightNameCheck = "Sc_ProcessReport_check";
+ string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//瀹℃牳鏉冮檺
@@ -2212,7 +2265,7 @@
}
var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
-
+
if (IsClose == 0)
{
if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
@@ -2229,8 +2282,8 @@
objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
- }
- else if(IsClose==1)
+ }
+ else if (IsClose == 1)
{
if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
{
@@ -2257,7 +2310,7 @@
return objJsonResult; ;
}
-
+
}
catch (Exception e)
{
@@ -2292,7 +2345,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
@@ -2310,11 +2363,11 @@
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉
- var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
- var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
+ var HMaker = ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
+ var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
if (IsAudit == 0)
{
if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
@@ -2331,7 +2384,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
else if (IsAudit == 1)
{
@@ -2349,7 +2402,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
else
{
@@ -2357,7 +2410,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
@@ -2379,7 +2432,7 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
[HttpGet]
- public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere,string user)
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere, string user)
{
DataSet ds;
try
@@ -2402,7 +2455,7 @@
else
{
string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere+ " order by hmainid desc ";
+ string sql = sql1 + sqlWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
}
}
@@ -2424,7 +2477,7 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
[HttpGet]
- public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere,string user)
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere, string user)
{
DataSet ds;
try
@@ -2468,8 +2521,8 @@
/// <param name="sqlWhere"></param>
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
- [HttpGet]
- public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere,string user)
+ [HttpGet]
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere, string user)
{
DataSet ds;
try
@@ -2492,7 +2545,7 @@
else
{
string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere+ " order by hmainid desc ";
+ string sql = sql1 + sqlWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
}
}
@@ -2599,7 +2652,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+
sendworksub.HEntryID = i;
sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
@@ -2726,7 +2779,7 @@
ReportMain.HCloseType = false;
ReportMain.HPrintQty = 0;
ReportMain.HMainSourceBillType = "3740";
- ReportMain.HMainSourceInterID =0;
+ ReportMain.HMainSourceInterID = 0;
ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo;
ReportMain.HInterID = 0;
ReportMain.HPeriod = 1;
@@ -2737,7 +2790,7 @@
ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
ReportMain.HExplanation = "";
ReportMain.HInnerBillNo = "";
- ReportMain.HSupID =Convert.ToInt32( ItemView.HSupID);
+ ReportMain.HSupID = Convert.ToInt32(ItemView.HSupID);
//淇濆瓨鍒版眹鎶ュ崟涓昏〃
@@ -2754,7 +2807,7 @@
ReportSub.HCloseType = false;
ReportSub.HSourceBillType = "3740";
ReportSub.HQty = Convert.ToDecimal(ItemView.HQty);
- ReportSub.HProcID =Convert.ToInt32( ItemView.HProcID);
+ ReportSub.HProcID = Convert.ToInt32(ItemView.HProcID);
ReportSub.HTimes = 0;
ReportSub.HSeOrderInterID = 0;
ReportSub.HSeOrderEntryID = 0;
@@ -3166,7 +3219,7 @@
WorkOrdersub.HSourceInterID = oItemSub.hmainid.Value; //--婧愬崟id
WorkOrdersub.HSourceEntryID = oItemSub.hsubid.Value; //--婧愬崟瀛怚D
WorkOrdersub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
- WorkOrdersub.HSourceBillType= oItemSub.HBillType; //--婧愬崟绫诲瀷
+ WorkOrdersub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
WorkOrdersub.HRelationQty = 0; //--鍏宠仈鏁伴噺
WorkOrdersub.HRelationMoney = 0; //--鍏宠仈閲戦
WorkOrdersub.HOrderBillNo = ""; //--閿�鍞鍗曞彿
@@ -3176,9 +3229,9 @@
WorkOrdersub.HQty = (double)oItemSub.璁″垝鏁伴噺; //--璁㈠崟鏁伴噺
WorkOrdersub.HEntrustType = "3739"; //--濮斿绫诲瀷
WorkOrdersub.HNextProcName = ""; //--涓嬮亾宸ュ簭
- WorkOrdersub.HPrice =0; //鍔犲伐璐�
+ WorkOrdersub.HPrice = 0; //鍔犲伐璐�
WorkOrdersub.HOutQty = 0; //--鍏宠仈鍙戝嚭鏁伴噺
- WorkOrdersub.HInQty =0; //--鍏宠仈鎺ユ敹鏁伴噺
+ WorkOrdersub.HInQty = 0; //--鍏宠仈鎺ユ敹鏁伴噺
WorkOrdersub.HBackSupDate = DateTime.Now; //--瀹為檯浜よ揣鏃ユ湡
WorkOrdersub.HInDate = DateTime.Now; //--浜よ揣鏃ユ湡
WorkOrdersub.HWorkProcFlow = ""; //--宸ヨ壓娴�
--
Gitblit v1.9.1