From d0db3d916857cfade2b781217849de6d5ce49c1e Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 21 十二月 2021 15:01:11 +0800
Subject: [PATCH] 班组职员清单
---
WebAPI/Controllers/生产管理/报工台工序/Sc_MESProductReportStepBillController.cs | 8
WebAPI/DLL/ClsSc_ProcessReport.cs | 45 ++++++++-
WebAPI/ListModels.cs | 27 +++++
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 5 +
WebAPI/Models/ClsSc_ProcessReportMain.cs | 33 ++++++
WebAPI/Models/ClsSc_ProcessReportSub.cs | 69 +++++++++++++
WebAPI/Controllers/ProductInController.cs | 1
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 94 +++++++++++-------
10 files changed, 241 insertions(+), 45 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 1f079d0..70246ba 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -812,6 +812,11 @@
omodel.MES_StationEntrustOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //报工台，工序汇报自动审核参数
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESProceReportWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
}
sReturn = "显示单据成功！";
return true;
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index fe5c2e7..7ced917 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -221,6 +221,8 @@
public string Sc_MaterToSourceBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
//异常反馈单
public string OA_ErrMsgBackBill_AutoCheck; //自动审核
+ //报工台工序汇报
+ public string Sc_MESProceReportWorkBill_AutoCheck; //自动审核
//QMS
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index c648fca..83525b9 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -469,6 +469,7 @@
//string sSourceBillType = lsmain[0].HBillType;
//BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
//return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
+
try
{
List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 56123ae..3554f14 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -597,15 +597,20 @@
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
{
string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
- ,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
- ,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
- ,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
- ,a.HSourceInterID,a.HSourceEntryID,a.HSourceBillNo, a.HSourceBillType
- from Sc_ICMOBillWorkQtyStatus_Tmp a
- left join Gy_Material m on a.HMaterID=m.hitemid
- left join Gy_Source s on a.HSourceID=s.HItemID
- left join Gy_Group g on a.HGroupID=g.HItemID
- left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
+ ,b.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
+ ,b.HEmpID,b.HEmpNumber,e.HName HEmpName,a.HMaker,a.HMakeDate, '宸ュ簭姹囨姤' HReportType
+ ,b.HQty,a.HICMOBillNo,a.HICMOInterID,pr.HProcNo,b.HProcID,p.HNumber HProcNumber,p.HName HProcName
+ ,b.HSourceInterID,b.HSourceEntryID,b.HSourceBillNo,b.HSourceBillType
+ from Sc_ProcessReportMain a
+ inner join Sc_ProcessReportSub b on a.HInterID=B.HInterID
+ inner join (select max(HProcNo) HProcNo,HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ from Sc_ProcessPlanSub group by HBillNo,HProcID,HSourceInterID,HSourceEntryID,HSourceBillNo)
+ pr on b.HSourceBillNo=pr.HSourceBillNo and b.HSourceInterID=pr.HSourceInterID and b.HSourceEntryID=pr.HSourceEntryID
+ left join Gy_Process p on b.HProcID=p.HItemID
+ left join Gy_Material m on a.HMaterID=m.hitemid
+ left join Gy_Source s on b.HSourceID=s.HItemID
+ left join Gy_Group g on a.HGroupID=g.HItemID
+ left join Gy_Employee e on b.HEmpID=e.HItemID "+sWhere+" and HRelationInterID='0'");
return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
}
#endregion
@@ -622,7 +627,7 @@
{
try
{
- ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ICMOBillWorkQtyStatus_Tmp with (nolock)" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
+ ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty from Sc_ProcessReportSub with (nolock)" + sWhere, "Sc_ProcessReportSub");
if (ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "1";
@@ -650,9 +655,9 @@
}
#endregion
- #region 鎶ュ伐骞冲彴浜ч噺姹囨姤淇濆瓨/缂栬緫
+ #region 鎶ュ伐骞冲彴宸ュ簭姹囨姤淇濆瓨/缂栬緫
/// <summary>
- /// 寮�宸ュ崟
+ /// 宸ュ簭姹囨姤鎻愪氦
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -669,12 +674,12 @@
ListModels oListModels = new ListModels();
try
{
- DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp();
- List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp> lsmain = new List<Models.ClsSc_ICMOBillWorkQtyStatus_Tmp>();
+ DLL.ClsSc_ProcessReport oBill = new DLL.ClsSc_ProcessReport();
+ List<Models.ClsSc_ProcessReportMain> lsmain = new List<Models.ClsSc_ProcessReportMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_MESProductReportFrom(msg2);
- foreach (Models.ClsSc_ICMOBillWorkQtyStatus_Tmp oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_ProcessReportMain(msg2);
+ foreach (Models.ClsSc_ProcessReportMain oItem in lsmain)
{
if (refSav == "Add")
{
@@ -725,10 +730,11 @@
}
}
- oItem.HBillType = "3724";
- oItem.HBillSubType = "3724";
- oItem.HReportType = 3;//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
+ oItem.HBillType = "3714";
+ oItem.HBillSubType = "3714";
oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -738,6 +744,30 @@
return objJsonResult;
}
oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<Models.ClsSc_ProcessReportSub> ls = new List<Models.ClsSc_ProcessReportSub>();
+ ls = oListModels.getObjectByJson_ProcessReportSub(msg2);
+ int i = 0;
+ foreach (Models.ClsSc_ProcessReportSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
}
//淇濆瓨
@@ -753,7 +783,7 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
- if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ if (oSystemParameter.omodel.Sc_MESProceReportWorkBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
objJsonResult.Verify = "Y";
}
@@ -797,7 +827,7 @@
}
#endregion
- #region 鎶ュ伐骞冲彴浜ч噺姹囨姤瀹℃牳銆佸弽瀹℃牳
+ #region 鎶ュ伐骞冲彴宸ュ簭姹囨姤瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
/// </summary>
@@ -809,7 +839,7 @@
[HttpGet]
public object MESProductAuditProcessReportList(int HSourceID, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, int HICMOInterID, int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "MES_ProcExchReport_Check";
+ string ModRightNameCheck = "MES_ProductReport_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -833,7 +863,7 @@
}
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp();
+ DLL.ClsSc_ProcessReport oBill = new DLL.ClsSc_ProcessReport();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -887,7 +917,7 @@
if (IsAudit == 0) //瀹℃牳鎻愪氦
{
//瀹℃牳鎻愪氦
- if (oBill.CheckBill(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -907,7 +937,7 @@
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
//鍙嶅鏍告彁浜bandonCheck
- if (oBill.AbandonCheck(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -945,17 +975,11 @@
try
{
oCN.BeginTran();
- //鏌ヨ浜ч噺姹囨姤涓存椂琛ㄦ暟閲�
- ds = oCN.RunProcReturn("select isnull(HQty,0) HQty,isnull(HWasterQty,0) HWasterQty,isnull(HBadQty,0) HBadQty from Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
- double HQty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
- double HWasterQty = double.Parse(ds.Tables[0].Rows[0]["HWasterQty"].ToString());
- double HBadQty = double.Parse(ds.Tables[0].Rows[0]["HBadQty"].ToString());
- double sumqty = HQty + HBadQty + HWasterQty; //姹囨姤鏁伴噺+涓嶈壇+鎶ュ簾
- //鏇存柊浜ч噺瑁呴噺涓存椂琛ㄥ凡姹囨姤鏁伴噺
- string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp set HICMOStatus='1',HFinishFlag='0', HRelationInterID=0,HSplitRelationQty=HSplitRelationQty-" + sumqty + ",HDateFinishQty=HDateFinishQty-" + sumqty + " where HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
+ //鍒犻櫎宸ュ簭姹囨姤瀛愯〃
+ string sql1 = string.Format(@"delete Sc_ProcessReportSub where HInterID='"+HInterID+"' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
oCN.RunProc(sql1);
- //鏇存柊鍒囨崲鐘舵�佸��
- string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
+ //鍒犻櫎宸ュ簭姹囨姤涓昏〃
+ string sql = string.Format(@"delete Sc_ProcessReportMain where HInterID='" + HInterID + "'");
oCN.RunProc(sql);
oCN.Commit();
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
index 0338614..77bd95d 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESProductReportStepBillController.cs"
@@ -26,13 +26,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
else
{
- string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
+ string sql1 = "select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where 1 = 1 ";
string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillProcessWorkQty_Tmp");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -59,7 +59,7 @@
try
{
//鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
- ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillProcessWorkQty_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillProcessWorkQty_Tmp");
if (ds.Tables[0].Rows.Count > 0)
{
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index b27244c..f70be5b 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -7,8 +7,8 @@
{
public class ClsSc_ProcessReport:DBUtility.ClsXt_BaseBill
{
- public Model.ClsSc_ProcessReportMain omodel = new Model.ClsSc_ProcessReportMain();
- public List<Model.ClsSc_ProcessReportSub> DetailColl = new List<Model.ClsSc_ProcessReportSub>();
+ public Models.ClsSc_ProcessReportMain omodel = new Models.ClsSc_ProcessReportMain();
+ public List<Models.ClsSc_ProcessReportSub> DetailColl = new List<Models.ClsSc_ProcessReportSub>();
public ClsSc_ProcessReport()
{
@@ -71,7 +71,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
+ foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_ProcessReportSub " +
" (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
@@ -143,7 +143,7 @@
",'" + omodel.HInnerBillNo + "','" + omodel.HMaker.ToString() + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
+ foreach (Models.ClsSc_ProcessReportSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_ProcessReportSub " +
" (HInterID,HEntryID,HProcID,HProcNumber,HEmpID" +
@@ -257,7 +257,7 @@
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsSc_ProcessReportSub oSub = new Model.ClsSc_ProcessReportSub();
+ Models.ClsSc_ProcessReportSub oSub = new Models.ClsSc_ProcessReportSub();
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
//
@@ -374,6 +374,41 @@
}
}
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ DataSet oDs = new DataSet();
+ string sBillName = "";
+ sReturn = "";
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ //
+ oDs = oCn.RunProcReturn("select * from Sc_ProcessReportSub where HInterID=" + lngBillKey.ToString(), "Sc_ProcessReportSub");
+ if (oDs == null || oDs.Tables[0].Rows.Count == 0)
+ {
+ return false;
+ }
+ for (int i = 0; i <= oDs.Tables[0].Rows.Count - 1; i++)
+ {
+ long ProdMoveInterID = DBUtility.ClsPub.CreateBillID("3771", ref DBUtility.ClsPub.sExeReturnInfo);
+ string ProdMoveBillNo = DBUtility.ClsPub.CreateBillCode("3771", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //oCn.RunProc("exec h_p_Sc_ProcProdMoveBill_Add " + lngBillKey.ToString() + "," + DBUtility.ClsPub.isLong(oDs.Tables[0].Rows[i]["HEntryID"]).ToString() + "," + ProdMoveInterID.ToString() + ",'" + ProdMoveBillNo + "','" + HChecker + "'");
+ sBillName = sBillName + ProdMoveBillNo + ",";
+ }
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
+
+ sReturn = sBillName;
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//鍒犻櫎鍏宠仈
public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 6367e07..fadab98 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1903,7 +1903,6 @@
return list;
}
#endregion
-
#region 鐝粍鑱屽憳娓呭崟
public List<Models.ClsGy_GroupEmpListMain> getObjectByJson_Gy_GroupEmpListMain(string jsonString)
{
@@ -1918,5 +1917,31 @@
return list;
}
#endregion
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportMain> getObjectByJson_ProcessReportMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 鎶ュ伐鍙板伐搴忔眹鎶ュ崟瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_ProcessReportSub> getObjectByJson_ProcessReportSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_ProcessReportMain.cs b/WebAPI/Models/ClsSc_ProcessReportMain.cs
new file mode 100644
index 0000000..79a11a2
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessReportMain.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessReportMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public string HBillSubType;// varchar(50) -- 子类型
+ public Int64 HCheckItemNowID;// int --当前审核项目（默认值 0） （界面不显示）
+ public Int64 HCheckItemNextID;// int --待审核项目（默认值 0）
+ public Int64 HICMOInterID;// int --任务单ID （界面不显示）
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HDeptID;// int --部门ID
+ public string HDeptNumber;// varchar(50) --部门代码
+ public Int64 HGroupID;// int --班组ID
+ public string HGroupNumber;// varchar(50) --班组代码
+ public Int64 HMaterID;// int --产品ID
+ public string HMaterNumber;// varchar(100) --产品代码
+ public Int64 HUnitID;// int --单位ID
+ public string HUnitNumber;// varchar(100) --单位代码
+ public double HPlanQty;// dec(18,8) --计划数量
+ public double HInStockQty;// dec(18,8) --入库数量
+ public Single HSumTimes;// money --总工作时间
+ public string HExplanation;// varchar(500) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public bool HCloseType;// bit --关闭类型
+ public Int64 HSupID; //供应商
+ public string HMarker; //检验人
+
+ public Int64 HICMOStatusInterID;//生产状态表内码
+ }
+}
diff --git a/WebAPI/Models/ClsSc_ProcessReportSub.cs b/WebAPI/Models/ClsSc_ProcessReportSub.cs
new file mode 100644
index 0000000..c53593c
--- /dev/null
+++ b/WebAPI/Models/ClsSc_ProcessReportSub.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_ProcessReportSub:DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID;// int --物料
+ public string HMaterNumber;// varchar(50) --物料代码
+ public Int64 HProcID;// int --工序
+ public string HProcNumber;// varchar(50) --工序代码
+ public Int64 HEmpID;// int --操作工
+ public string HEmpNumber;// varchar(50) --操作工代码
+ public Int64 HSourceID;// int --生产资源ID
+ public DateTime HRelBeginDate;// datetime --实际开工日期
+ public DateTime HRelEndDate;// datetime --实际完工日期
+ public Single HTimes;// money --实作时间
+ public double HQty;// dec(18,8) --实作数量
+ public double HCheckQty;// dec(18,8) --合格数量
+ public Single HBadCount;// money --不良品数
+ public Single HWasterQty;// money --因工报废数量
+ public Single HWasterQty2;// money --因料报废数量
+ public double HPrice;// dec(18,8) --工序工价
+ public Single HMoney;// money -- 计件金额
+
+ public Single HBadPrirce;// money -- 不良单价
+ public Single HBadMoney;// money -- 不良金额
+ public Single HWasterPrice;// money -- 报废单价
+ public Single HWasterMoney;// money -- 报废金额
+ public Single HQualityRate;// money -- 质量系数
+ public Single HOutPrice; //加工单价
+ public Single HOutMoney; //加工费金额
+ public Single HWeight; //加工重量
+
+ public double HSecUnitQty1;// dec(18,8) -- 辅助单位数量1
+ public Single HSecUnitRate1;// money -- 换算率1
+ public double HSecUnitQty2;// dec(18,8) -- 辅助单位数量2
+ public Single HSecUnitRate2;// money -- 换算率2
+ public Single HUsingQty;// money -- 让步数量
+ public Single HSelfBadCount;// money -- 本道返工
+ public Single HPreBadCount;// money -- 前道不良数
+
+ public Single HPayMentQty;// money -- 结算数量
+ public Single HOtherDeduct;// money -- 其他扣款（油石费
+ public Single HRelPay;// money -- 实得工资
+
+ public string HOtherItem1;// varchar(50) --其他属性1（游隙）
+ public string HOtherItem2;// varchar(50) --其他属性2（盖子）
+ public string HOtherItem3;// varchar(50) --其他属性3（油脂）
+ public string HOtherItem4;// varchar(50) --其他属性4（级别）
+ public string HOtherItem5;// varchar(50) --其他属性5
+ public string HPackType;// varchar(50) --包装类型
+
+ public Int64 HCheckEmpID;// int --检验员
+ public string HCheckEmpNumber;// varchar(50) --检验员代码
+
+ public Int64 HProcPlanInterID;// int --工序计划单ID
+ public Int64 HProcPlanEntryID;// int --工序计划单子ID
+ public string HProcPlanBillNo;// varchar(50) --工序计划单号
+ public Int64 HICMOInterID;// int --任务单ID
+ public string HICMOBillNo;// varchar(50) --任务单号
+ public Int64 HSeOrderInterID;// int --销售订单主ID
+ public Int64 HSeOrderEntryID;// int --销售子ID
+ public string HSeOrderBillNo;// varchar(50) --销售订单号
+ public string HRemark;// --备注
+ public string HBatchNo;
+ }
+}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4732023..63020b4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -460,6 +460,8 @@
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
<Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportSub.cs" />
<Compile Include="Models\GetWeekList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
--
Gitblit v1.9.1