From d4795e2359ff150cd1fd6a1a8a5b798d8e37c373 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:24:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 12 +-
WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 19 +++-
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 208 +++++++++++++++++++++------------------------------
3 files changed, 105 insertions(+), 134 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index cc01042..9d7818d 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -390,6 +390,40 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴楠岃瘉鍗曟嵁鐘舵��
+ [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
+ [HttpGet]
+ public object GetMESBeginWorkBillStaus(string sWhere)
+ {
+ try
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
+ objJsonResult.data = null;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+ objJsonResult.data = null;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ex.Message;
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
#region 鎶ュ伐骞冲彴鎶ユ鐢宠鍒楄〃(浜ч噺姹囨姤鍒楄〃)
[Route("Sc_MESBeginWorkBill/GetMESProductReportBillList")]
@@ -418,7 +452,7 @@
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
{
- string sql = string.Format(@"select a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
+ string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,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
@@ -427,105 +461,8 @@
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 + "");
+ left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
- }
- #endregion
-
- #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
- [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
- [HttpGet]
- public object SaveGetMESProductReportBillList([FromBody] JObject msg)
- {
- var _value = msg["msg"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
-
- string UserName = "";
-
- ListModels oListModels = new ListModels();
- try
- {
- DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
- List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
- msg2 = msg2.Replace("\\", "");
- msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
- foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain)
- {
-
- //oItem.HMaker = "";
- UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3711";
- oItem.HBillSubType = "3711";
- 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";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- oBill.omodel = oItem;
- }
- //瀛愯〃浣撴暟鎹�
-
- List<Models.ClsSc_ICMOReportBillSub> ls = new List<Models.ClsSc_ICMOReportBillSub>();
- ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg2);
- int i = 0;
- foreach (Models.ClsSc_ICMOReportBillSub oItemSub in ls)
- {
-
- i++;
- oItemSub.HEntryID = i;
-
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- oBill.DetailColl.Add(oItemSub);
-
- }
- //淇濆瓨
- //淇濆瓨瀹屾瘯鍚庡鐞�
- bool bResult;
- if (oBill.omodel.HInterID == 0)
- {
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- }
- else
- {
- bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- }
- if (bResult)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- objJsonResult.data = 1;
- return objJsonResult;
- }
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- objJsonResult.data = 1;
- return objJsonResult;
- }
}
#endregion
@@ -612,41 +549,70 @@
}
#endregion
-
- #region 鎶ュ伐骞冲彴楠岃瘉鍗曟嵁鐘舵��
- [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
+ #region 鎶ュ伐骞冲彴浜ч噺姹囨姤鍒犻櫎
+ [Route("Sc_MESBeginWorkBill/DeltetMESProductReportBill")]
[HttpGet]
- public object GetMESBeginWorkBillStaus(string sWhere)
+ public object DeleteGetLineBindBillList(string HInterID)
{
try
{
- ds=new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
- if (ds.Tables[0].Rows.Count > 0)
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
- objJsonResult.data = null;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
- objJsonResult.data = null;
- }
-
+ oCN.BeginTran();
+ //鏇存柊鍒囨崲鐘舵�佸��
+ string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "'");
+ oCN.RunProc(sql);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎璧勬簮鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
}
- catch (Exception ex)
+ catch (Exception e)
{
+
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = ex.Message;
+ objJsonResult.Message = e.Message.ToString();
objJsonResult.data = null;
+
}
return objJsonResult;
}
#endregion
+ #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
+ [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
+ [HttpGet]
+ public object SaveGetMESProductReportBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
+ List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
}
}
diff --git a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index b0d1ae8..eae40e6 100644
--- a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -77,14 +77,19 @@
//若MAINDI重复则重新获取
oCn.BeginTran();
//主表
+
oCn.RunProc("Insert Into Sc_ICMOBillWorkQtyStatus_Tmp " +
- "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
- ",HQty,HBarCode,HAddr,HMaker,HMakeDate" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
- ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
- ") " +
+ "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
+ ",HMaterID,HGroupID,HWorkManID,HWorkReportDate,HDate" +
+ ",HBillSubType,HBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
+ ",HQty,HBadQty,HWasterQty,HBarCode,HAddr,HMaker,HMakeDate" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
+ ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
+ ") " +
" values(" + omodel.HInterID.ToString() + ",'" + BillType + "'," + omodel.HSourceID.ToString() + "," + omodel.HReportType.ToString() + "," + omodel.HPieceQty.ToString() +
- "," + omodel.HQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'" +
+ "," + omodel.HMaterID.ToString() + ",'" + omodel.HGroupID + "','" + omodel.HWorkManID + "','" + omodel.HWorkReportDate + "','" + omodel.HDate + "'" +
+ ",'" + omodel.HBillSubType.ToString() + "','" + omodel.HBillNo + "','" + omodel.HICMOInterID + "','" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'" +
+ "," + omodel.HQty.ToString() + "," + omodel.HBadQty.ToString() + "," + omodel.HWasterQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HMaker+ "','" + omodel.HMakeDate + "'" +
"," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo + "','" + omodel.HSplitNO + "','" + omodel.HSourceBillType + "'" +
"," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString() +
") ");
@@ -123,7 +128,7 @@
omodel.HBarCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCode"]);
omodel.HAddr = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAddr"]);
omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
- omodel.HMakeDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HMakeDate"]);
+ omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
omodel.HSourceInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceInterID"]);
omodel.HSourceEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceEntryID"]);
omodel.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"]);
diff --git a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 9fe2f36..3126a6b 100644
--- a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -16,19 +16,19 @@
public string HBillNo; //单据号
public string HRemark; //备注
public string HBacker; //退回人
- public DateTime HBackDate; //退回时间
+ public string HBackDate; //退回时间
public string HBackRemark; //退回原因
public string HChecker; //审核人
- public DateTime HCheckDate; //审核日期
+ public string HCheckDate; //审核日期
public string HMaker; //制单人
- public DateTime HMakeDate; //制单日期
+ public string HMakeDate; //制单日期
public string HUpDater;//修改人
- public DateTime HUpDateDate; //修改日期
+ public string HUpDateDate; //修改日期
public string HCloseMan; //关闭人
- public DateTime HCloseDate;//关闭日期
+ public string HCloseDate;//关闭日期
public bool HCloseType; //关闭类型
public string HDeleteMan;// 作废人
- public DateTime HDeleteDate; //作废日期
+ public string HDeleteDate; //作废日期
public string HSplitNO;//派工单
public int HICMOInterID; //生产订单主ID
public int HICMOEntryID;//生产订单子ID
--
Gitblit v1.9.1