From baaa9227a9e0b720ce2f4bca20b18d270982ee93 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 01 八月 2022 10:04:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
LMES/bin/x86/Debug.zip | 0
WarM/条码打印/Sc_ICMOToBarCode.cs | 6
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36 ++--
WebAPI/Controllers/Sc_PckSplitBillController.cs | 204 ++++++++++++++++++++++++-
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 19 ++
WebAPI/Controllers/LMESController.cs | 2
WebAPI/Models/ClsSc_AssemblyBillMain.cs | 28 +++
/dev/null | 0
WorkM/报表分析/MES_ICMOBillStatusReport.cs | 5
WebAPI/ListModels.cs | 23 ++
WebAPI/Web.config | 4
WorkM/报表分析/MES_ICMOBillStatusReport.designer.cs | 84 +++++++---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 4
WebAPI/Models/ClsSc_AssemblyBillSub.cs | 24 +++
WebAPI/WebAPI.csproj | 3
WebAPI/DLL/ClsSc_PHPCruxBillBill.cs | 25 +++
16 files changed, 403 insertions(+), 64 deletions(-)
diff --git a/LMES/bin/x86/Debug.rar b/LMES/bin/x86/Debug.rar
deleted file mode 100644
index aa8ea7a..0000000
--- a/LMES/bin/x86/Debug.rar
+++ /dev/null
Binary files differ
diff --git a/LMES/bin/x86/Debug.zip b/LMES/bin/x86/Debug.zip
new file mode 100644
index 0000000..2dc4dd0
--- /dev/null
+++ b/LMES/bin/x86/Debug.zip
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 83a651c..477733f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -1047,7 +1047,7 @@
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HSourceID,HInterID " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HPrdDate,HBC,HInnerBillNo " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID1.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() + ", " + HMZQty.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -1055,7 +1055,7 @@
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+ ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HSourceID.ToString() + "," + HInterID.ToString()
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HPrdDate + "','" + HBC + "','" + HInnerBillNo + "')");
oCn.RunProc("exec h_p_WMS_SetMaxNo '" + HTMNumber + "'");
DisplayTM();
@@ -1603,7 +1603,7 @@
private void DisplayTM()
{
//HInterID = DBUtility.ClsPub.isInt(txtHMaterID.Tag);
- DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList_test Where HinterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷 = '鎵樼洏鏉＄爜' order by HItemID", "h_v_IF_BarCodeBillList_test", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index a34f6e1..fd02fef 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -552,6 +552,25 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+
+ //鍒犻櫎鍓嶅垽鏂叧鑱旀暟閲�
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds;
+ ds = oCn.RunProcReturn("select ct from ( " +
+ " select 1 ct from Sc_StationInBillMain Where HProcExchInterID=" + lngBillKey + " " +
+ " union all " +
+ " select 1 from Sc_StationOutBillMain Where HProcExchInterID=" + lngBillKey + " ) as a ", "Sc_ProcExchReportSub");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗″凡缁忔湁涓嬫父杩涘嚭绔欏崟鍚庯紝涓嶅厑璁稿垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
DBUtility.ClsPub.HOrgID = HPRDORGID;
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 89db549..f71a2bc 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -389,7 +389,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by HEntryID", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/Sc_PckSplitBillController.cs b/WebAPI/Controllers/Sc_PckSplitBillController.cs
index a123d40..b90657a 100644
--- a/WebAPI/Controllers/Sc_PckSplitBillController.cs
+++ b/WebAPI/Controllers/Sc_PckSplitBillController.cs
@@ -380,7 +380,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -388,7 +388,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -405,20 +405,82 @@
}
#endregion
- #region 浜х嚎鍏抽敭浠剁粦瀹歋N鍙锋煡璇�
- [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ #region 浜х嚎鍏抽敭浠剁粦瀹�
+ /// <summary>
+ /// SN鍙锋煡璇�
+ /// </summary>
+ /// <param name="HBarCode">SN鍙�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxSNBillList")]
[HttpGet]
- public Object Get_PHPCruxBillList(string HBarCode)
+ public Object Get_PHPCruxSNBillList(int HinterID, string HBarCode,int HProcID,string HBillNo)
{
try
{
- string sql1 = string.Format(@"select a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,a.HQtyMust,0 HQty,'"+ HBarCode + "' as HCPM from Sc_PPBomBillSub a left join Gy_Material m on a.HMaterID=m.HItemID where HICMOEntryID=(select HSourceEntryID from Gy_BarCodeBill where HBarCode='"+HBarCode+"')");
- DataSet ds = oCn.RunProcReturn(sql1, "Sc_PPBomBillSub");
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxSNBillTOTemp '"+HBarCode+"',"+HinterID+","+HProcID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxSNBillTOTemp");
if (ds.Tables[0].Rows.Count == 0 || ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏌ヨ澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["sel"]) ==0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else{
+ //鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鍏抽敭鐮佹煡璇�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Get_PHPCruxBillList")]
+ [HttpGet]
+ public Object Get_PHPCruxBillList(int HinterID,string HPCrux,string HBillNo)
+ {
+ try
+ {
+ string sql1 = string.Format($"exec h_p_Sc_PHPCruxBillTOTemp '" +HPCrux+"',"+ HinterID+",'"+ HBillNo+"'");
+ DataSet ds = oCn.RunProcReturn(sql1, "h_p_Sc_PHPCruxBillTOTemp");
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉″舰鐮佷俊鎭紒" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "2";
+ objJsonResult.count = 2;
+ objJsonResult.Message = "閿欒锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -427,7 +489,7 @@
//鍏堝瓨杩涗复鏃惰〃鍐嶈繑鍥炴暟鎹�
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏆傛棤鏁版嵁";
+ objJsonResult.Message = "鏌ヨ鎴愬姛";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -442,6 +504,130 @@
return objJsonResult;
}
}
+
+ /// <summary>
+ /// 鎵爜缂撳瓨鍒犻櫎
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Delete_PHPCruxBillListByME")]
+ [HttpGet]
+ public Object Delete_PHPCruxBillListByME(int HInterID,int HMaterID,string HBarCode)
+ {
+ try
+ {
+ oCn.BeginTran();
+ string sql = string.Format(@"delete Sc_AssemblyBill_BindBarCodeTemp where HInterID="+ HInterID+" and HMaterID="+ HMaterID+ " and HBarCode='" + HBarCode+"'");
+ oCn.RunProc(sql);
+ //鍒犻櫎鎴愬姛
+ string sql1= string.Format(@"select a.HEntryID,a.HMaterID,m.HName HMaterName,m.HModel HMaterSpec,1 HQty,HBarCode HPJM
+ from Sc_AssemblyBill_BindBarCodeTemp a left join Gy_Material m on a.HMaterID=m.HItemID
+ where HInterID=" + HInterID);
+ DataSet ds=oCn.RunProcReturn(sql1, "Sc_AssemblyBill_BindBarCodeTemp");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 缁勮鍗曟彁浜�
+ /// </summary>
+ /// <param name="HBarCode">鍏抽敭鐮�</param>
+ /// <returns></returns>
+ [Route("Sc_PckSplit/Add_PHPCruxBillList")]
+ [HttpPost]
+ public Object Add_PHPCruxBillList([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 msg3 = sArray[1].ToString();//閰嶄欢鍒楄〃
+ string msg4 = sArray[2].ToString();//鏉＄爜鍒楄〃
+ string msg5 = sArray[3].ToString();//鐧诲綍浜�
+ ListModels oListModels = new ListModels();
+ long HinterID;
+ string HBillNo = "";
+
+ try
+ {
+ DLL.ClsSc_PHPCruxBillBill oBill = new DLL.ClsSc_PHPCruxBillBill();
+ List<Models.ClsSc_AssemblyBillMain> lsmain = new List<Models.ClsSc_AssemblyBillMain>();//鍩烘湰璧勬枡
+ List<Models.ClsSc_AssemblyBillMain> lspjItme = new List<Models.ClsSc_AssemblyBillMain>();//閰嶄欢鍒楄〃
+ List<Models.ClsSc_AssemblyBillSub> lstmItme = new List<Models.ClsSc_AssemblyBillSub>();//鎵爜鍒楄〃
+ //鍩烘湰璧勬枡_json鏍煎紡杞崲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain(msg2);
+
+ HinterID = lsmain[0].HInterID;//涓籌D
+ HBillNo = lsmain[0].HBillNo;//鍗曟嵁鍙�
+
+
+ //浜嬪姟寮�濮�
+ oCn.BeginTran();
+ //鏍规嵁interID鍦ㄦ簮鍗曚复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds1 = oCn.RunProcReturn("select top 1 * from Sc_AssemblyBill_BindSourceTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindSourceTemp");
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = "Insert Into Sc_AssemblyBillMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate," +
+ "HBillNo,HBillStatus,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus" +
+ ") " +
+ " values('" + DateTime.Now.Year + "','" + DateTime.Now.Month + "',3727,3727," + HinterID + ",'" + DateTime.Now+
+ "','" + HBillNo + "',1,'"+msg5+"',getdate()" +
+ ",0,'" + lsmain[0].HBarCode + "'" +
+ "," + ds1.Tables[0].Rows[0]["HSourceInterID"].ToString() + ",'" + ds1.Tables[0].Rows[0]["HSourceBillNo"].ToString() + "','" + lsmain[0].HBarCode + "',0,0,'鐢熶骇涓�'" +
+ ") ";
+ oCn.RunProc(sql);
+
+ //鏍规嵁interID鍦ㄦ壂鐮佷复鏃惰〃涓煡鎵炬暟鎹�
+ DataSet ds2 = oCn.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HInterID=" + HinterID, "Sc_AssemblyBill_BindBarCodeTemp");
+ for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
+ {
+ string sq2 = "Insert Into Sc_AssemblyBillSub " +
+ "(HInterID,HBillNo_bak,HEntryID," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HSourceID,HEquipID,HUnitID,HQty,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber" +
+ ") " +
+ " values(" + HinterID + ",'" + HBillNo + "'," + i +
+ "," + ds2.Tables[0].Rows[i]["HSourceInterID"].ToString() + "," + ds2.Tables[0].Rows[i]["HSourceEntryID"].ToString() + ",'" + ds2.Tables[0].Rows[i]["HSourceBillNo"].ToString() + "'" +
+ ",''," + ds2.Tables[0].Rows[i]["HMaterID"].ToString() + ",'"+ lsmain[0].HSCZYID + "',0,0,1," + lsmain[0].HGroupID + "," + lsmain[0].HKeeperID + ",getdate(),'" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + ds2.Tables[0].Rows[i]["HBarCode"].ToString() + "','" + lsmain[0].HBarCode + "'" +
+ ") ";
+ oCn.RunProc(sq2);
+ }
+ 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 = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
+
}
}
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 151eb51..54dbdc0 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -219,7 +219,9 @@
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
+ model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
JArray Fentity = new JArray();
+
foreach (DataRow item in ds.Tables[0].Rows)
{
JObject FentityModel = new JObject();
@@ -318,7 +320,7 @@
Ids = fID,
};
result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
- //result2 = InvokeHelper.Audit("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();
diff --git a/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
new file mode 100644
index 0000000..c251614
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_PHPCruxBillBill.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsSc_PHPCruxBillBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSc_AssemblyBillMain omodel = new Models.ClsSc_AssemblyBillMain();
+ public List<Models.ClsSc_AssemblyBillSub> DetailColl = new List<Models.ClsSc_AssemblyBillSub>();
+
+ public ClsSc_PHPCruxBillBill()
+ {
+ base.MvarItemKeySub = "Sc_AssemblyBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sc_AssemblyBillMain";
+ base.MvarReportTitle = "鐢熶骇缁勮鍗�";
+ base.BillType = "3727";
+ base.HBillSubType = "3727";
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 4ed8160..cbb9302 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1985,5 +1985,28 @@
return list;
}
+ /// <summary>
+ /// 缁勮杩芥函-涓�
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 缁勮杩芥函-瀛�
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_AssemblyBillSub>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillMain.cs b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
new file mode 100644
index 0000000..bf9758c
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillMain.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_AssemblyBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HICMOInterID;// int --浠诲姟鍗旾D锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+ public Int64 HMaterID = 0;// int --浜у搧ID
+ public Int64 HUnitID=0;// int --鍗曚綅ID
+ public string HICMOBillNo;// varchar(200) --浠诲姟鍗曞彿 锛堟壂鐮佷骇鍝佹潯鐮佸甫鍑猴級
+ public string HBarCode_P;// varchar(50) --浜у搧鏉″舰鐮�
+ public string HAssemblyStatus; //缁勮鐘舵�侊紙鐢熶骇涓紝姹囨姤锛屾楠岋紝鍖呰锛屽叆搴擄級
+ public string HCPM;
+ public int HGroupID;
+ //public string HGroupName;
+ public int HKeeperID;
+ //public string HKeeperName;
+ public string HBarCode;
+ //public string HProc;
+ public int HProcID;
+ public string HPCrux;
+ public string HSCZY;
+ public int HSCZYID;
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_AssemblyBillSub.cs b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
new file mode 100644
index 0000000..cbe7945
--- /dev/null
+++ b/WebAPI/Models/ClsSc_AssemblyBillSub.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_AssemblyBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID;// int --鐗╂枡ID
+ public Int64 HUnitID;// 鍗曚綅ID
+ public double HQty;// 鏁伴噺
+ public Int64 HSourceID;// 鐢熶骇璧勬簮ID锛堥潪蹇呰锛�
+ public Int64 HEquipID;// 鐢熶骇璁惧ID锛堥潪蹇呰锛�
+ public Int64 HGroupID;// 鐢熶骇鐝粍ID锛堥潪蹇呰锛�
+ public Int64 HWorkerID;// 鎿嶄綔宸D锛堥潪蹇呰锛�
+ public string HScanDate;// --鎵弿鏃堕棿
+ public string HBarCode;// varchar(50) --鏉″舰鐮�
+ public string HBarCode_P;// varchar(50) --浜у搧鏉＄爜
+ public string HSNNumber;// SN鍙凤紙闈炲繀濉級
+ public string HPJM;
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c828f26..cad06b8 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>07/31/2022 12:56:21</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/18/2022 18:17:10</publishTime>
+ <publishTime>07/31/2022 12:56:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>07/31/2022 12:56:19</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/18/2022 18:17:09</publishTime>
+ <publishTime>07/31/2022 12:56:19</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/31/2022 12:56:12</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/31/2022 12:56:12</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,10 +93,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>07/31/2022 12:56:15</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/18/2022 18:17:08</publishTime>
+ <publishTime>07/31/2022 12:56:15</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -129,22 +129,22 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/31/2022 12:56:10</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/31/2022 12:56:10</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/18/2022 18:17:06</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/18/2022 18:17:07</publishTime>
+ <publishTime>07/31/2022 12:56:11</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -255,13 +255,13 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>07/31/2022 12:56:25</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/18/2022 18:17:15</publishTime>
+ <publishTime>07/31/2022 12:56:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -273,7 +273,7 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>06/28/2022 08:44:51</publishTime>
+ <publishTime>07/27/2022 08:46:55</publishTime>
</File>
<File Include="Content/bootstrap.css">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -459,7 +459,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/18/2022 18:17:23</publishTime>
+ <publishTime>07/31/2022 12:56:38</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0d54a06..c117bfe 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
- <add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
@@ -92,7 +92,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3ea52f..898efca 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -537,6 +537,7 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
@@ -545,6 +546,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
index e179de0..17ed8f1 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.cs"
@@ -140,8 +140,9 @@
DataSet DSet = new DataSet();
//杩囨护鏉′欢Dlg
string sDlgWhere = "";
- sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
- sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHBDate.Value.ToShortDateString() + "'";
+ //sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + "'";
+ sDlgWhere = sDlgWhere + ",'" + txtHMaterName.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHICMOBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHProcessExchangeBillNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + cmbHICMOBillStatus.Text.Trim() + "'";
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
index b8ea027..891f154 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/MES_ICMOBillStatusReport.designer.cs"
@@ -32,6 +32,9 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MES_ICMOBillStatusReport));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.Tool = new System.Windows.Forms.ToolStrip();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
@@ -58,9 +61,8 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtHMaterName = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -98,6 +100,34 @@
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ //
+ // cSVToolStripMenuItem
+ //
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// yl
//
@@ -208,6 +238,8 @@
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.label4);
+ this.pPic.Controls.Add(this.txtHMaterName);
this.pPic.Controls.Add(this.label6);
this.pPic.Controls.Add(this.txtHProcessExchangeBillNo);
this.pPic.Controls.Add(this.cmbHICMOBillStatus);
@@ -249,7 +281,8 @@
this.cmbHICMOBillStatus.Items.AddRange(new object[] {
"鍏ㄩ儴",
"WMS缁撴",
- "鏈粨妗�"});
+ "鏈粨妗�",
+ "K3缁撴"});
this.cmbHICMOBillStatus.Location = new System.Drawing.Point(723, 3);
this.cmbHICMOBillStatus.Name = "cmbHICMOBillStatus";
this.cmbHICMOBillStatus.Size = new System.Drawing.Size(143, 20);
@@ -290,6 +323,7 @@
this.dtpHEDate.Name = "dtpHEDate";
this.dtpHEDate.Size = new System.Drawing.Size(107, 21);
this.dtpHEDate.TabIndex = 10;
+ this.dtpHEDate.Visible = false;
//
// label1
//
@@ -300,6 +334,7 @@
this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 7;
this.label1.Text = "寮�濮嬫棩鏈�";
+ this.label1.Visible = false;
//
// label2
//
@@ -310,6 +345,7 @@
this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 8;
this.label2.Text = "缁撴潫鏃ユ湡";
+ this.label2.Visible = false;
//
// dtpHBDate
//
@@ -318,6 +354,7 @@
this.dtpHBDate.Name = "dtpHBDate";
this.dtpHBDate.Size = new System.Drawing.Size(107, 21);
this.dtpHBDate.TabIndex = 9;
+ this.dtpHBDate.Visible = false;
//
// lblCaption
//
@@ -368,33 +405,22 @@
this.grdSum.Size = new System.Drawing.Size(1190, 19);
this.grdSum.TabIndex = 49;
//
- // toolStripDropDownButton1
+ // label4
//
- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.eXCELToolStripMenuItem,
- this.cSVToolStripMenuItem});
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
- this.toolStripDropDownButton1.Text = "寮曞嚭";
- this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.label4.AutoSize = true;
+ this.label4.BackColor = System.Drawing.Color.Transparent;
+ this.label4.Location = new System.Drawing.Point(654, 32);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(53, 12);
+ this.label4.TabIndex = 114;
+ this.label4.Text = "浜у搧鍚嶇О";
//
- // eXCELToolStripMenuItem
+ // txtHMaterName
//
- this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.eXCELToolStripMenuItem.Text = "EXCEL";
- this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
- //
- // cSVToolStripMenuItem
- //
- this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
- this.cSVToolStripMenuItem.Text = "CSV";
- this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
+ this.txtHMaterName.Location = new System.Drawing.Point(723, 28);
+ this.txtHMaterName.Name = "txtHMaterName";
+ this.txtHMaterName.Size = new System.Drawing.Size(143, 21);
+ this.txtHMaterName.TabIndex = 113;
//
// MES_ICMOBillStatusReport
//
@@ -454,5 +480,7 @@
private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
+ private System.Windows.Forms.Label label4;
+ public System.Windows.Forms.TextBox txtHMaterName;
}
}
\ No newline at end of file
--
Gitblit v1.9.1