LMES/DingDing_autoGetData.resx
@@ -452,4 +452,7 @@ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>333, 17</value> </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>192</value> </metadata> </root> Model/Model.csproj
@@ -702,6 +702,7 @@ <Compile Include="车é´ç®¡ç\ClsGy_WorkBeginDotCheckListBillMain.cs" /> <Compile Include="车é´ç®¡ç\ClsCJ_WIPBeginStockBillMain.cs" /> <Compile Include="车é´ç®¡ç\ClsCJ_WIPBeginStockBillSub.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_ProcessExchangeBillSub_BatchSplit.cs" /> <Compile Include="车é´ç®¡ç\ClsSc_WorkBeginDotCheckBillMain.cs" /> <Compile Include="车é´ç®¡ç\ClsGy_MaterPreventErrMouldBillSub.cs" /> <Compile Include="车é´ç®¡ç\ClsQc_PreventErrMouldCheckBillSub.cs" /> Model/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckOtherBillSub.cs
@@ -20,7 +20,7 @@ public string HInSpectValT; public string HDefectLevel; public bool HDestructInspect; public double HKeyInspect; public bool HKeyInspect; public string HStatus; public Int64 HSampleQty; public Int64 HSampleSchemeID; Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillSub_BatchSplit.cs
New file @@ -0,0 +1,22 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsSc_ProcessExchangeBillSub_BatchSplit : DBUtility.ClsXt_BaseBillSub { public Int64 HICMOInterID;//ç产订å主å ç public Int64 HICMOEntryID;//ç产订ååå ç public string HICMOBillNo;//ç产订åå· public Int64 HMaterID;//ç©æå ç public double HQty;//çäº§è®¢åæ°é public double HFinishQty;//å·²çææµè½¬å¡æ°é public double HUsableQty;//å©ä½å¯çææµè½¬å¡æ°é public double HProQty;//æµè½¬å¡æ°é public Int64 HRoutingInterID;//å·¥èºè·¯çº¿å ç public DateTime HDate;//æµè½¬å¡æ¥æ } } Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1816,6 +1816,16 @@ { omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_MustBeginWorkCtl") { omodel.MES_StationOutBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //=========设å¤å·¥èºåæ°ç¹æ£ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_MustBeginWorkCtl") { omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //=========å·¥åºå§å¤ååºå //èªå¨æ°å¢ Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -529,6 +529,7 @@ public string MES_StationOutBill_DeleteRelationCtl; //åºç«æ±æ¥åå 餿¶æ¯å¦è¿è¡å ³èæ§å¶ public string MES_StationOutBill_NextQtyCtl; //æ¬éåºç«æ°éä¸å 许å°äºä¸éè¿ç«æ°é public string MES_StationOutBill_QtyRateCtl; //æ¬éåºç«æ°éæ±æ»æ°ä¸è½å¤§äºæµè½¬å¡æ°éä¸é public string MES_StationOutBill_MustBeginWorkCtl; //å¿ é¡»å¼å·¥ç¶ææè½ä¿ååæ® //ä¸è¯åè¯å®¡å public string QC_NoPassProdCheckBill_AutoCheck; //ä¿å忝å¦èªå¨å®¡æ ¸ @@ -620,7 +621,8 @@ public string QC_ProcessCheckBill_QCSchemeSource; //è´¨æ£æ¹æ¡æ¥æº //设å¤å·¥èºåæ°è®¢åç¹æ£è¡¨ public string SB_EquipICMOTechParamBill_MustBeginWorkCtl; //å¿ é¡»å¼å·¥ç¶ææè½ä¿ååæ® //å·¥èºè·¯çº¿ public string Gy_RoutingBill_AutoCheck; //ä¿å忝å¦èªå¨å®¡æ ¸ WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -87,6 +87,7 @@ public bool IsHide; public string Alignment; public string ColumnWidth; public string ColumnName_Other; } [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")] @@ -136,7 +137,10 @@ var width = omdelsub[i].ColumnWidth; if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0) width = "120"; HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width},"; var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other; HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},"; } HGridString = HGridString.Substring(0, HGridString.Length - 1); WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -343,35 +343,35 @@ objJsonResult.data = null; return objJsonResult; } //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); //if (ds == null) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "夿æ°é失败ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (ds.Tables[0].Rows.Count == 0) //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "夿æ°é失败ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") //{ // oCN.RollBack(); // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); // objJsonResult.data = null; // return objJsonResult; //} ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl"); if (ds == null) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "夿æ°é失败ï¼"; objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows.Count == 0) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "夿æ°é失败ï¼"; objJsonResult.data = null; return objJsonResult; } if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]); objJsonResult.data = null; return objJsonResult; } oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1"); //夿æ¯å¦æ¯ é¦éå·¥åº ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " + WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -277,6 +277,19 @@ return objJsonResult; } } //夿å½å工忝å¦å¼å·¥ else if (oSystemParameter.omodel.MES_StationOutBill_MustBeginWorkCtl == "Y") { ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp"); if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å½åå·¥å䏿¯å¼å·¥ç¶æä¸è½æ±æ¥ï¼"; objJsonResult.data = null; return objJsonResult; } } else { if (HQty + HWasterQty <= 0) { WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -580,6 +580,50 @@ } #endregion #region è½¦é´æ¨¡å ç产æ¥éæ±æ¨¡å ·æ¥è¡¨ æ¥è¯¢ [Route("Mes_OrderProcFlowAllReport/getSc_MouldRequirementDay")] [HttpGet] public object getSc_MouldRequirementDay(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRequirementDay order by æ¥æ desc", "h_v_Sc_MouldRequirementDay"); } else { string sql1 = "select * from h_v_Sc_MouldRequirementDay where 1 = 1 "; string sql = sql1 + sWhere + " order by æ¥æ "; ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRequirementDay"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1986,8 +1986,8 @@ } string[] HInterEntryIDArr = HInterID.Split(','); string[] HData; DataTable dt = new DataTable(); for (int i = 0; i < HInterEntryIDArr.Length; i++) { @@ -1997,12 +1997,22 @@ ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchange_BatchSplit"); if (i == 0) { dt = ds.Tables[0]; } else { foreach (DataRow item in ds.Tables[0].Rows) { DataRow dataRow = dt.NewRow(); dataRow.ItemArray = item.ItemArray; dt.Rows.Add(dataRow); } } } if (ds == null || ds.Tables[0].Rows.Count == 0) if (dt == null || dt.Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -2015,7 +2025,7 @@ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.data = dt; return objJsonResult; } } @@ -2030,5 +2040,284 @@ } #endregion #region[æ¹éæå䏿¨-ä¿åæé®] /// <summary> /// æ°å¢åæ®-ä¿åæé® ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Sc_ProcessExchangeBill/AddBill_BatchSplit")] [HttpPost] public object AddBill_BatchSplit([FromBody] JObject sMainSub) { var _value = sMainSub["sMainSub"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString();//æç»è¡ä¿¡æ¯ string HUser = sArray[1].ToString();//ç¨æ· string HComputerName = SystemInformation.ComputerName; //设å¤åç§° string UserName = ""; ListModels oListModels = new ListModels(); bool bResult = true; try { if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, HUser)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æµè½¬å¡æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill(); //è¡¨ä½æ°æ® //æ },{æ¥æåæ°ç» //廿ãåã msg2 = msg2.Substring(1, msg2.Length - 2); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "â"); List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> ls = new List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>(); ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(msg2); DateTime dt = DateTime.Now; string sql = ""; string HBillNo = ""; Int64 HICMOInterID = 0; Int64 HICMOEntryID = 0; string HICMOBillNo = ""; double HQty = 0; foreach (Model.ClsSc_ProcessExchangeBillSub_BatchSplit oItemSub in ls) { HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo, true); HICMOInterID = oItemSub.HICMOInterID; HICMOEntryID = oItemSub.HICMOEntryID; HICMOBillNo = oItemSub.HICMOBillNo; HQty = oItemSub.HQty; sql = "select * from h_v_Sc_ProcessExchangeBill_BatchSplit where hmainid = " + oItemSub.HICMOInterID + " and hentryid = " + oItemSub.HICMOEntryID; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBill_BatchSplit"); //主表èµå¼ if (ds.Tables[0].Rows.Count > 0 && ds != null) { oBill.omodel.HBillNo = HBillNo; oBill.omodel.HBillSubType = "3772"; oBill.omodel.HMainSourceBillSubType = "3710"; oBill.omodel.HDate = oItemSub.HDate; oBill.omodel.HMaker = HUser; oBill.omodel.HMakeDate = System.DateTime.Now.ToString("G"); oBill.omodel.HPrevMainSourceInterID = 0; oBill.omodel.HYear = DBUtility.ClsPub.isLong(oItemSub.HDate.Year); oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(oItemSub.HDate.Month); oBill.omodel.HRemark = ""; oBill.omodel.HBatchNo = ""; oBill.omodel.HMainMaterID = 0; oBill.omodel.HKeyMaterID = 0; oBill.omodel.HNo = 0; oBill.omodel.HOrderProcNO = ds.Tables[0].Rows[0]["HPlanOrderProcNo"].ToString(); oBill.omodel.HWWOrderInterID = 0; oBill.omodel.HWWOrderEntryID = 0; oBill.omodel.HWWOrderBillNo = ""; oBill.omodel.HEquipMentID = 0; //! oBill.omodel.HICMOBillNo = oItemSub.HICMOBillNo; oBill.omodel.HMaterID = oItemSub.HMaterID; oBill.omodel.HMaterNumber = ds.Tables[0].Rows[0]["HMaterNumber"].ToString(); oBill.omodel.HUnitID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HUnitID"]); oBill.omodel.HMateOutBatchNo = ""; oBill.omodel.HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString(); oBill.omodel.HMaterID2 = oItemSub.HMaterID; oBill.omodel.HProjectNum = ""; oBill.omodel.HPlanQty = oItemSub.HQty; oBill.omodel.HQty = oItemSub.HProQty; oBill.omodel.HPlanBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oBill.omodel.HPlanEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oBill.omodel.HExplanation = ""; oBill.omodel.HInnerBillNo = ""; oBill.omodel.HSupID = 0; oBill.omodel.HWorkShopID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]); oBill.omodel.HWorkTypeNum = ""; oBill.omodel.HProdMaterCode = ""; oBill.omodel.HSeOrderBillNo = ds.Tables[0].Rows[0]["HSeOrderBillNo"].ToString(); oBill.omodel.HCusShortName = ""; oBill.omodel.HCusNeedMaterial = ""; oBill.omodel.HPlanSendGoodsDate = dt.ToShortDateString().ToString(); oBill.omodel.HProdMaterName = ""; oBill.omodel.HCusName = ""; oBill.omodel.HWorkRemark = ""; oBill.omodel.HImportNote = ""; oBill.omodel.HMaterNumber_A = ""; oBill.omodel.HMaterNumber_B = ""; oBill.omodel.HMaterNumber_C = ""; oBill.omodel.HMaterNumber_D = ""; oBill.omodel.HProdType = ""; oBill.omodel.HMaterShortName = ""; oBill.omodel.HMaterIDA = ""; oBill.omodel.HMaterIDB = ""; oBill.omodel.HMaterIDC = ""; oBill.omodel.HMaterIDD = ""; oBill.omodel.HICMOInterID = oItemSub.HICMOInterID; oBill.omodel.HICMOEntryID = oItemSub.HICMOEntryID; oBill.omodel.HPicNumVer = ""; oBill.omodel.HPicNumAssemble = ""; oBill.omodel.HMaterTexture = ""; oBill.omodel.HProductNum = ""; oBill.omodel.HVerNum = ""; oBill.omodel.HPRDORGID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HPRDORGID"]); oBill.omodel.HBLFlag = false; oBill.omodel.HCusNumber = ""; oBill.omodel.HPickLabel = ""; oBill.omodel.HPickLabelNumber = ""; oBill.omodel.HXTNumber = ""; oBill.omodel.HXTModel = ""; oBill.omodel.HWorkBillSortNo = "";//! oBill.omodel.HRoutingBillID = oItemSub.HRoutingInterID.ToString(); oBill.omodel.HMaterModel = ds.Tables[0].Rows[0]["HMaterModel"].ToString(); oBill.omodel.HWidth = 0; oBill.omodel.HWeight = 0; oBill.omodel.HAuxQty = 0; oBill.omodel.HAuxUnit = 0; oBill.omodel.HAuxQty2 = 0; oBill.omodel.HAuxUnit2 = 0; oBill.omodel.HSplitNo = 0; oBill.omodel.HHeight = ""; oBill.omodel.HInches = ""; oBill.omodel.HAl1Long = ""; oBill.omodel.HDensity = ""; oBill.omodel.HTela = ""; oBill.omodel.HUnderTela = ""; oBill.omodel.HSizing = ""; oBill.omodel.HSellDate = dt.ToShortDateString().ToString(); oBill.omodel.HRemark2 = "æ¹éæå䏿¨"; oBill.omodel.HRemark3 = ""; oBill.omodel.HEmpID = 0; oBill.omodel.HCusID = 0; oBill.omodel.HColorRemark = ""; oBill.omodel.HSplitSumQty = 0; oBill.omodel.HSplitColorQty = 0; oBill.omodel.HMachineLine = ""; oBill.omodel.HMainSourceInterID = 0; oBill.omodel.HMainSourceEntryID = 0; oBill.omodel.HMainSourceBillNo = ""; oBill.omodel.HOrderLevID = 0; oBill.omodel.HWidth_New = 0; oBill.omodel.HRemark_New = ""; oBill.omodel.HWeight_New = 0; oBill.omodel.HPlanOrderProcNo = ds.Tables[0].Rows[0]["HPlanOrderProcNo"].ToString(); oBill.omodel.HMouldNum = "0"; } //å表èµå¼ for(int i = 0; i < ds.Tables[0].Rows.Count; i++) { Model.ClsSc_ProcessExchangeBillSub oItemSubs = new Model.ClsSc_ProcessExchangeBillSub(); oItemSubs.HEntryID = i + 1; oItemSubs.HBillNo_bak = HBillNo; oItemSubs.HCloseMan = ""; oItemSubs.HEntryCloseDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oItemSubs.HCloseType = false; oItemSubs.HRemark = ""; oItemSubs.HSourceInterID = HICMOInterID; oItemSubs.HSourceEntryID = HICMOEntryID; oItemSubs.HSourceBillNo = HICMOBillNo; oItemSubs.HSourceBillType = "3710"; oItemSubs.HRelationQty = 0; oItemSubs.HRelationMoney = 0; oItemSubs.HRelationQty_In = 0; oItemSubs.HRelationQty_Out = 0; oItemSubs.HRelationQty_WWOrder = 0; oItemSubs.HRelationQty_Bad = 0; oItemSubs.HProcNo = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HProcNo"]); oItemSubs.HProcID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HProcID"]); oItemSubs.HProcNumber = ds.Tables[0].Rows[i]["HProcNumber"].ToString(); oItemSubs.HWorkRemark = ""; oItemSubs.HCenterID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HCenterID"]); oItemSubs.HDeptID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HDeptID"]); oItemSubs.HDeptNumber = ds.Tables[0].Rows[i]["HDeptNumber"].ToString(); oItemSubs.HGroupID = 0; oItemSubs.HGroupNumber = ""; oItemSubs.HWorkerID = 0; oItemSubs.HWorkerNumber = ""; oItemSubs.HSourceID = 0; oItemSubs.HQty = HQty; oItemSubs.HTimeUnit = ""; oItemSubs.HPlanWorkTimes = 0; oItemSubs.HPlanBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oItemSubs.HPlanEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oItemSubs.HRelBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oItemSubs.HRelEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString()); oItemSubs.HReadyTime = 0; oItemSubs.HQueueTime = 0; oItemSubs.HMoveTime = 0; oItemSubs.HBeginDayQty = 0; oItemSubs.HBeginFixQty = 0; oItemSubs.HFixWorkDays = 0; oItemSubs.HTrunWorkDays = 0; oItemSubs.HReadyTimes = 0; oItemSubs.HMyWorkDays = 0; oItemSubs.HOutPrice = 0; oItemSubs.HOutMoney = 0; oItemSubs.HPassRate = 0; oItemSubs.HLastProc = ""; oItemSubs.HKeyProc = ""; oItemSubs.HFstProc = ""; oItemSubs.HICMOInterID = HICMOInterID; oItemSubs.HICMOBillNo = HICMOBillNo; oItemSubs.HWWOrderInterID = 0; oItemSubs.HWWOrderEntryID = 0; oItemSubs.HWWOrderBillNo = ""; oItemSubs.HReportQty = 0; oItemSubs.HBackProc = false; oItemSubs.HSupID = 0; oItemSubs.HSupFlag = false; oItemSubs.HOverRate = 0; oItemSubs.HMaxQty = 0; oItemSubs.HTechnologyParameter = ""; oItemSubs.HProcCheckNote = ""; oItemSubs.HPicNum = ""; oItemSubs.HMouldNo = ""; oItemSubs.HProcWorkNum = ""; oItemSubs.HSeOrderInterID = 0; oItemSubs.HSeOrderEntryID = 0; oItemSubs.HSNCtrl = false; oBill.DetailColl.Add(oItemSubs);//æ·»å æç»è¡å¼ } //è°ç¨ä¿åæ¹æ³ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); oBill.DetailColl.Clear();//æ¸ ç©ºæç»è¡å¼ if (!bResult) { break; } } if (bResult) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; 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 } } WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -15,6 +15,7 @@ public class SB_EquipICMOTechParamBillController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); public const string ModName = "3919"; //åæ®ç±»å public const string ModCaption = "设å¤å·¥èºåæ°è®¢åç¹æ£è¡¨"; //åæ®åç§° public const string ModRightName = "SB_EquipICMOTechParamBill"; @@ -739,8 +740,26 @@ oBill.DetailColl.Add(oItemSub); } //ä¿å bool bResult; //è·åç³»ç»åæ° string Ret = ""; if (oSystemParameter.ShowBill(ref Ret)) { if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl == "Y") { ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HICMOBillNo = '" + oBill.omodel.HICMOBillNo + "' and HInterID = '" + oBill.omodel.HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp"); if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å½åå·¥å䏿¯å¼å·¥ç¶æä¸è½è¿è¡è®¾å¤å·¥èºåæ°ç¹æ£ï¼"; objJsonResult.data = null; return objJsonResult; } } } //ä¿å bool bResult; if (OperationType == "1") //æ°å¢ä¿å { bResult = oBill.AddBill (ref DBUtility.ClsPub.sExeReturnInfo); WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -944,7 +944,14 @@ { try { ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp"); Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere); string HSourceID = dic["HSourceID"].ToString(); string HICMOBillNo = dic["HICMOBillNo"].ToString(); string HInterID = dic["HInterID"].ToString(); string Type = dic["type"].ToString(); ds = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IpadIndexButton '"+ HSourceID + "','" + HICMOBillNo + "','" + HInterID + "','" + Type + "'", "h_p_IpadIndexButton"); if (ds.Tables[0].Rows.Count > 0) { objJsonResult.code = "1"; WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -6788,7 +6788,8 @@ { List<object> columnNameList = new List<object>(); string sql = "select a.HSourceBillNo æµè½¬å¡å·,a.HSourceBillType æµè½¬å¡ç±»å,a.HSourceInterID æµè½¬å¡ä¸»å ç ,a.HSourceEntryID æµè½¬å¡åå ç ,b.HNumber ç©æä»£ç ,b.HName ç©æåç§°,b.HModel è§æ ¼åå·,a.HPlanQty è®¡åæ°é from Sc_ICMOBillStatus_Tmp a left join Gy_Material b on a.HMaterID=b.HItemID where HSourceBillNo='" + HSourceBill + "'"; string sql = "select a.HSourceBillNo æµè½¬å¡å·,a.HSourceBillType æµè½¬å¡ç±»å,a.HSourceInterID æµè½¬å¡ä¸»å ç ,a.HSourceEntryID æµè½¬å¡åå ç ,b.HNumber ç©æä»£ç ,b.HName ç©æåç§°,b.HModel è§æ ¼åå·,a.HPlanQty è®¡åæ°é,a.HSourceID,c.HName çäº§èµæº from Sc_ICMOBillStatus_Tmp a " + "left join Gy_Material b on a.HMaterID=b.HItemID left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "'"; ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp"); //æ·»å åå WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs
@@ -229,7 +229,7 @@ oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet); oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet); oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod); oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect); oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect); oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID); oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult); BillNew.DetailColl.Add(oSub); @@ -1240,7 +1240,7 @@ oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet); oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet); oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod); oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect); oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect); oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID); oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0); WebAPI/Controllers/¹¤×ʹÜÀí/HR_EmployeeSkillExamBillController.cs
@@ -230,8 +230,8 @@ oItem.HBillType = "2332"; oItem.HBillSubType = "2332"; oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month); oItem.HYear = DBUtility.ClsPub.isLong(oItem.HDate.Year); oItem.HPeriod = DBUtility.ClsPub.isLong(oItem.HDate.Month); oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -397,7 +397,7 @@ //OriginatorId = "12", //æ ¹æ®æµç¨åèµ·äººå·¥å·æ¥è¯¢ã //TaskId = "12", //ä»»å¡IDã CreateFromTimeGMT = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //å建æ¶é´èµ·å§å¼ã CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //å建æ¶é´èµ·å§å¼ã CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //å建æ¶é´ç»æ¢å¼ã PageSize = pageSize, //å页大å°ã @@ -1492,6 +1492,9 @@ return false; } string[] studyLevelList = new string[] {"","é«ä¸","ä¸ä¸","大ä¸","æ¬ç§","","","å ¶ä»","åä¸","å°å¦" }; for (int i = 0; i < response.Result.Count; i++) { List<string> fieldNameList = new List<string>(); @@ -1522,6 +1525,15 @@ { int index = fieldNameList.IndexOf("å¦å"); oItem.HStudyLevel = response.Result[i].FieldDataList[index].FieldValueList[0].Value; if (oItem.HStudyLevel != null && oItem.HStudyLevel != "") { long studyLevelIndex = DBUtility.ClsPub.isLong(oItem.HStudyLevel); if (studyLevelIndex >= studyLevelList.Length) { studyLevelIndex = 0; } oItem.HStudyLevel = studyLevelList[studyLevelIndex]; } } if (fieldNameList.IndexOf("é¨é¨") >= 0) WebAPI/ListModels.cs
@@ -836,6 +836,18 @@ } /// <summary> /// å¤çæ°å¢å·¥åºæµè½¬å¡å表2çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>>(jsonString); return list; } /// <summary> /// å¤çæ°å¢åºç«æ±æ¥å主表çjson /// </summary> /// <param name="jsonString"></param> WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,12 +4,39 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2024-06-08T04:38:30.4153773Z;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> <History>True|2024-08-21T08:09:41.0487181Z;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/AlibabaCloud.EndpointUtil.dll"> <publishTime>04/07/2020 16:33:48</publishTime> </File> <File Include="bin/AlibabaCloud.GatewayDingTalk.dll"> <publishTime>04/25/2023 17:49:04</publishTime> </File> <File Include="bin/AlibabaCloud.GatewaySpi.dll"> <publishTime>07/31/2024 20:50:30</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiClient.dll"> <publishTime>08/06/2024 18:07:52</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiUtil.dll"> <publishTime>11/22/2022 11:24:18</publishTime> </File> <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll"> <publishTime>08/08/2024 19:43:22</publishTime> </File> <File Include="bin/AlibabaCloud.TeaUtil.dll"> <publishTime>07/15/2024 20:25:56</publishTime> </File> <File Include="bin/AlibabaCloud.TeaXML.dll"> <publishTime>08/03/2022 21:46:08</publishTime> </File> <File Include="bin/Aliyun.Credentials.dll"> <publishTime>07/24/2024 10:36:58</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 16:43:40</publishTime> @@ -18,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>06/08/2024 12:38:12</publishTime> <publishTime>08/19/2024 08:51:07</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>06/08/2024 12:38:12</publishTime> <publishTime>08/19/2024 08:51:07</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>06/08/2024 12:38:10</publishTime> <publishTime>08/19/2024 08:50:56</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>06/08/2024 12:38:10</publishTime> <publishTime>08/19/2024 08:50:56</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>06/08/2024 12:38:08</publishTime> <publishTime>08/19/2024 08:50:48</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>06/08/2024 12:38:08</publishTime> <publishTime>08/19/2024 08:50:48</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -66,7 +93,7 @@ <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> @@ -84,16 +111,16 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>06/08/2024 12:38:08</publishTime> <publishTime>08/19/2024 08:50:49</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>06/08/2024 12:38:08</publishTime> <publishTime>08/19/2024 08:50:49</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/04/2014 04:33:56</publishTime> <publishTime>03/08/2023 15:09:56</publishTime> </File> <File Include="bin/NPOI.dll"> <publishTime>10/23/2021 09:07:54</publishTime> @@ -120,25 +147,25 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>06/08/2024 12:38:04</publishTime> <publishTime>08/19/2024 08:50:45</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>06/08/2024 12:38:04</publishTime> <publishTime>08/19/2024 08:50:45</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>06/08/2024 12:38:06</publishTime> <publishTime>08/19/2024 08:50:46</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>06/08/2024 12:38:06</publishTime> <publishTime>08/19/2024 08:50:46</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>06/08/2024 12:38:07</publishTime> <publishTime>08/19/2024 08:50:47</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>06/08/2024 12:38:07</publishTime> <publishTime>08/19/2024 08:50:47</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> @@ -176,8 +203,14 @@ <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Extensions.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Net.Http.Primitives.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll"> <publishTime>09/19/2018 03:38:10</publishTime> @@ -213,7 +246,7 @@ <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 12:02:18</publishTime> @@ -242,14 +275,23 @@ <File Include="bin/System.Xml.Linq.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Tea.dll"> <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>08/21/2024 16:07:09</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>08/21/2024 16:07:09</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>06/08/2024 12:38:18</publishTime> <publishTime>08/21/2024 16:09:38</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>06/08/2024 12:38:18</publishTime> <publishTime>08/21/2024 16:09:38</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -261,58 +303,58 @@ <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Config/kdapi.config"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/Site.css"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Global.asax"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> @@ -321,7 +363,7 @@ <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> @@ -330,121 +372,121 @@ <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="libman.json"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>07/12/2023 08:14:21</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="packages.config"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>08/12/2024 15:14:33</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/web.config"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>05/25/2024 09:46:41</publishTime> <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> <publishTime>06/08/2024 12:38:29</publishTime> <publishTime>08/21/2024 14:50:10</publishTime> </File> </ItemGroup> </Project> WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2024-08-19T07:51:06.3264524Z;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History> <History>True|2024-08-21T08:15:39.3970105Z;True|2024-08-21T16:15:21.1951828+08:00;False|2024-08-21T16:15:00.1718456+08:00;True|2024-08-21T15:52:14.1734637+08:00;True|2024-08-21T15:51:10.6106267+08:00;False|2024-08-21T15:50:05.7560087+08:00;True|2024-08-21T14:26:54.6150600+08:00;True|2024-08-21T10:36:07.4567215+08:00;True|2024-08-21T10:09:07.9820150+08:00;True|2024-08-21T10:08:57.7601146+08:00;False|2024-08-21T10:08:41.4637507+08:00;True|2024-08-19T15:51:06.3264524+08:00;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History> <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>08/19/2024 15:50:50</publishTime> <publishTime>08/21/2024 16:14:50</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>08/19/2024 15:50:50</publishTime> <publishTime>08/21/2024 16:14:50</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>08/19/2024 15:50:48</publishTime> <publishTime>08/21/2024 16:14:49</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>08/19/2024 15:50:48</publishTime> <publishTime>08/21/2024 16:14:49</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:14:46</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:14:46</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:14:46</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:14:46</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -147,25 +147,25 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>08/19/2024 15:50:44</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>08/19/2024 15:50:44</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>08/19/2024 15:50:45</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>08/19/2024 15:50:45</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>08/19/2024 15:50:45</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>08/19/2024 15:50:45</publishTime> <publishTime>08/21/2024 16:14:45</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> @@ -279,19 +279,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:02:12</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>08/19/2024 15:50:46</publishTime> <publishTime>08/21/2024 16:02:14</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>08/19/2024 15:50:55</publishTime> <publishTime>08/21/2024 16:14:55</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>08/19/2024 15:50:55</publishTime> <publishTime>08/21/2024 16:14:55</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -486,7 +486,7 @@ <publishTime>05/25/2024 09:46:41</publishTime> </File> <File Include="Web.config"> <publishTime>08/19/2024 15:51:05</publishTime> <publishTime>08/21/2024 16:15:20</publishTime> </File> </ItemGroup> </Project>