From cff4f71fc0fb6748a5822029be71370abe94402e Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期三, 29 十二月 2021 00:39:34 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 37 + WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 194 ++++---- Model/车间管理/ClsSc_PackUnionBillMain.cs | 7 WebAPI/Controllers/Kf_ICStockBillMainController.cs | 148 ++++++ WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 11 WebAPI/WebAPI.csproj.user | 8 WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 5 WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs | 6 WarM/条码打印/Gy_BarCodeBill.cs | 217 +++++--- WebAPI/Controllers/SellOutController.cs | 1 WebAPI/Models/Gy_Mould.cs | 2 WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 152 ++++++ WebAPI/WebAPI.csproj | 6 WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs | 146 ++++++ WebAPI/DLL/ClsKf_SellOutBackBill.cs | 476 +++++++++++++++++++ 15 files changed, 1,218 insertions(+), 198 deletions(-) diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_PackUnionBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_PackUnionBillMain.cs" index e1983bc..88ebe5c 100644 --- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_PackUnionBillMain.cs" +++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_PackUnionBillMain.cs" @@ -11,5 +11,12 @@ public string HBarCode_Pack; public Int64 HMaterID; public Int64 HUnitID; + public double HWeight;// money --净重 + public double HMWeight;// money --毛重 + public double HPWeight;// money --皮重 + public int HProdOrgID;// int --生产组织 + public int HDeptID;// int --车间 + public int HEmpID;// int --操作员 + public string HBarCode_Cus;// varchar(100) --客户标签号 } } diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" index 7987c2b..5bfb837 100644 --- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" +++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" @@ -39,45 +39,46 @@ public const Int16 HBarCodeTypeCol = 18; public const Int16 HBatchManagerCol = 19; public const Int16 HBatchNoCol = 20; - public const Int16 HQtyCol = 21; - public const Int16 HMinQtyCol = 22; - public const Int16 HBQtyCol = 23; - public const Int16 HDeptIDCol = 24; - public const Int16 HDeptNumberCol = 25; - public const Int16 HDeptNameCol = 26; - public const Int16 HSourceIDCol = 27; - public const Int16 HSourceNumberCol = 28; - public const Int16 HSourceNameCol = 29; - public const Int16 HDateCol = 30; - public const Int16 HEndDateCol = 31; - public const Int16 HSupIDCol = 32; - public const Int16 HSupNumberCol = 33; - public const Int16 HSupNameCol = 34; - public const Int16 HCusIDCol = 35; - public const Int16 HCusNumberCol = 36; - public const Int16 HCusNameCol = 37; - public const Int16 HCusTypeCol = 38; - public const Int16 HSourceInterIDCol = 39; - public const Int16 HSourceEntryIDCol = 40; - public const Int16 HSourceBillNoCol = 41; - public const Int16 HSourceBillTypeCol = 42; - public const Int16 HInstructIDCol = 43; - public const Int16 HInstructNoCol = 44; - public const Int16 HSeOrderBillIDCol = 45; - public const Int16 HSeOrderBillNoCol = 46; - public const Int16 HWhIDCol = 47; - public const Int16 HWhNumberCol = 48; - public const Int16 HWhNameCol = 49; - public const Int16 HSPIDCol = 50; - public const Int16 HSPNumberCol = 51; - public const Int16 HSPNameCol = 52; - public const Int16 HinitQtyCol = 53; - public const Int16 HRemarkCol = 54; - public const Int16 HPinfanBarCodeCol = 55; - public const Int16 HMTONoCol = 56; - public const Int16 HShowDateCol = 57; - public const Int16 HInnerBillNoCol = 58; - public const Int16 HMakerCol = 59; + public const Int16 HGiveAwayFlagCol = 21; + public const Int16 HQtyCol = 22; + public const Int16 HMinQtyCol = 23; + public const Int16 HBQtyCol = 24; + public const Int16 HDeptIDCol = 25; + public const Int16 HDeptNumberCol = 26; + public const Int16 HDeptNameCol = 27; + public const Int16 HSourceIDCol = 28; + public const Int16 HSourceNumberCol = 29; + public const Int16 HSourceNameCol = 30; + public const Int16 HDateCol = 31; + public const Int16 HEndDateCol = 32; + public const Int16 HSupIDCol = 33; + public const Int16 HSupNumberCol = 34; + public const Int16 HSupNameCol = 35; + public const Int16 HCusIDCol = 36; + public const Int16 HCusNumberCol = 37; + public const Int16 HCusNameCol = 38; + public const Int16 HCusTypeCol = 39; + public const Int16 HSourceInterIDCol = 40; + public const Int16 HSourceEntryIDCol = 41; + public const Int16 HSourceBillNoCol = 42; + public const Int16 HSourceBillTypeCol = 43; + public const Int16 HInstructIDCol = 44; + public const Int16 HInstructNoCol = 45; + public const Int16 HSeOrderBillIDCol = 46; + public const Int16 HSeOrderBillNoCol = 47; + public const Int16 HWhIDCol = 48; + public const Int16 HWhNumberCol = 49; + public const Int16 HWhNameCol = 50; + public const Int16 HSPIDCol = 51; + public const Int16 HSPNumberCol = 52; + public const Int16 HSPNameCol = 53; + public const Int16 HinitQtyCol = 54; + public const Int16 HRemarkCol = 55; + public const Int16 HPinfanBarCodeCol = 56; + public const Int16 HMTONoCol = 57; + public const Int16 HShowDateCol = 58; + public const Int16 HInnerBillNoCol = 59; + public const Int16 HMakerCol = 60; public Int16 HSelectCol = 0; public Int16 HSno2Col = 1; @@ -93,49 +94,50 @@ public Int16 HAuxPropNumber2Col = 11; public Int16 HAuxPropName2Col = 12; public Int16 HBatchNo2Col = 13; - public Int16 HUnitID2Col = 14; - public Int16 HUnitNumber2Col = 15; - public Int16 HUnitName2Col = 16; - public Int16 HQty2Col = 17; - public Int16 HWeiCol = 18; - public Int16 HPrintCol = 19; - public Int16 HDeptID2Col = 20; - public Int16 HDeptNumber2Col = 21; - public Int16 HDeptName2Col = 22; - public Int16 HSourceID2Col = 23; - public Int16 HSourceNumber2Col = 24; - public Int16 HSourceName2Col = 25; - public Int16 HDate2Col = 26; - public Int16 HEndDate2Col = 27; - public Int16 HBarcodeNoCol = 28; - public Int16 HBarcodeQtysCol = 29; - public Int16 HSupID2Col = 30; - public Int16 HSupNumber2Col = 31; - public Int16 HSupName2Col = 32; - public Int16 HCusID2Col = 33; - public Int16 HCusNumber2Col = 34; - public Int16 HCusName2Col = 35; - public Int16 HCusType2Col = 36; - public Int16 HSourceInterID2Col = 37; - public Int16 HSourceEntryID2Col = 38; - public Int16 HSourceBillNo2Col = 39; - public Int16 HSourceBillType2Col = 40; - public Int16 HInstructID2Col = 41; - public Int16 HInstructNo2Col = 42; - public Int16 HSeOrderBillID2Col = 43; - public Int16 HSeOrderBillNo2Col = 44; - public Int16 HWhID2Col = 45; - public Int16 HWhNumber2Col = 46; - public Int16 HWhName2Col = 47; - public Int16 HSPID2Col = 48; - public Int16 HSPNumber2Col = 49; - public Int16 HSPName2Col = 50; - public Int16 HRemark2Col = 51; - public Int16 HPinfanBarCode2Col = 52; - public Int16 HMTONo2Col = 53; - public Int16 HShowDate2Col = 54; - public Int16 HInnerBillNo2Col = 55; - public Int16 HMaker2Col = 56; + public Int16 HGiveAwayFlag2Col = 14; + public Int16 HUnitID2Col = 15; + public Int16 HUnitNumber2Col = 16; + public Int16 HUnitName2Col = 17; + public Int16 HQty2Col = 18; + public Int16 HWeiCol = 19; + public Int16 HPrintCol = 20; + public Int16 HDeptID2Col = 21; + public Int16 HDeptNumber2Col = 22; + public Int16 HDeptName2Col = 23; + public Int16 HSourceID2Col = 24; + public Int16 HSourceNumber2Col = 25; + public Int16 HSourceName2Col = 26; + public Int16 HDate2Col = 27; + public Int16 HEndDate2Col = 28; + public Int16 HBarcodeNoCol = 29; + public Int16 HBarcodeQtysCol = 30; + public Int16 HSupID2Col = 31; + public Int16 HSupNumber2Col = 32; + public Int16 HSupName2Col = 33; + public Int16 HCusID2Col = 34; + public Int16 HCusNumber2Col = 35; + public Int16 HCusName2Col = 36; + public Int16 HCusType2Col = 37; + public Int16 HSourceInterID2Col = 38; + public Int16 HSourceEntryID2Col = 39; + public Int16 HSourceBillNo2Col = 40; + public Int16 HSourceBillType2Col = 41; + public Int16 HInstructID2Col = 42; + public Int16 HInstructNo2Col = 43; + public Int16 HSeOrderBillID2Col = 44; + public Int16 HSeOrderBillNo2Col = 45; + public Int16 HWhID2Col = 46; + public Int16 HWhNumber2Col = 47; + public Int16 HWhName2Col = 48; + public Int16 HSPID2Col = 49; + public Int16 HSPNumber2Col = 50; + public Int16 HSPName2Col = 51; + public Int16 HRemark2Col = 52; + public Int16 HPinfanBarCode2Col = 53; + public Int16 HMTONo2Col = 54; + public Int16 HShowDate2Col = 55; + public Int16 HInnerBillNo2Col = 56; + public Int16 HMaker2Col = 57; // public string ModName = "85"; public string ModCaption = "鏉$爜鐢熸垚"; @@ -830,6 +832,13 @@ grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value; grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value; grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value; + grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value; + //缃戞牸鎵撳嬀 + DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell(); + oCell.ThreeState = false; + oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value; + oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter; + grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell; k = k + 1; n = n + 1; oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); @@ -867,6 +876,7 @@ string HWorkLineName = ""; string HSeOrderBillNo = ""; string HInnerBillNo = ""; + bool HGiveAwayFlag = false; try { oCn.BeginTran(); @@ -903,12 +913,14 @@ HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value); HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value); HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value); + HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value); oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " + ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " + ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " + + ",HGiveAwayFlag " + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " + ") values (" + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() @@ -917,6 +929,7 @@ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'" + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'" + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')"); @@ -975,7 +988,7 @@ // grdMain.RowCount = 0; grdSub.RowCount = 0; - grdMain.ColumnCount = 60; //鎬诲垪鏁� + grdMain.ColumnCount = 61; //鎬诲垪鏁� DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name); grdMain.Columns[HSnoCol].HeaderText = "搴忓彿"; grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D"; @@ -998,6 +1011,7 @@ grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉$爜绫诲瀷"; grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规"; grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿"; + grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧"; grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺"; grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟"; grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟"; @@ -1089,12 +1103,23 @@ "," + HRemarkCol.ToString(); //璁剧疆鍚堣鍒� string sTotalCol = HQtyCol.ToString(); + + //璁剧疆鐗规畩鍒� + for (int i = 0; i < grdMain.Rows.Count; i++) + { + //缃戞牸鎵撳嬀 + DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell(); + oCell.ThreeState = false; + oCell.Value = 0; + oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter; + grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell; + } // DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid); //---------------------------- - grdSub.ColumnCount = 57; //鎬诲垪鏁� + grdSub.ColumnCount = 58; //鎬诲垪鏁� DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name); grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨"; grdSub.Columns[HTMCol].HeaderText = "鏉$爜缂栧彿"; @@ -1111,6 +1136,7 @@ grdSub.Columns[HPinfan2Col].HeaderText = "鍝佺暘"; grdSub.Columns[HPinfanBarCode2Col].HeaderText = "HPinfanBarCode"; grdSub.Columns[HBatchNo2Col].HeaderText = "鎵瑰彿"; + grdSub.Columns[HGiveAwayFlag2Col].HeaderText = "鏄惁璧犲搧"; grdSub.Columns[HUnitID2Col].HeaderText = "璁¢噺鍗曚綅ID"; grdSub.Columns[HUnitNumber2Col].HeaderText = "璁¢噺鍗曚綅浠g爜"; grdSub.Columns[HUnitName2Col].HeaderText = "璁¢噺鍗曚綅"; @@ -1194,6 +1220,17 @@ grdSub.Columns[HSourceID2Col].Visible = false; grdSub.Columns[HSourceNumber2Col].Visible = false; grdSub.Columns[HSourceName2Col].Visible = false; + + //璁剧疆鐗规畩鍒� + for (int i = 0; i < grdSub.Rows.Count; i++) + { + //缃戞牸鎵撳嬀 + DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell(); + oCell.ThreeState = false; + oCell.Value = 0; + oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter; + grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell; + } DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name); DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub"); @@ -1905,6 +1942,18 @@ grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString(); grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString(); grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString(); + if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�") + { + if (oTable.Rows[0]["鏄惁璧犲搧"].ToString() == "鏄�") + { + grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1; + } + else + { + grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0; + } + } + } if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�") { diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 0c3a0cc..41081e7 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -594,6 +594,8 @@ int HCaveQty = mainList[0].HCaveQty; int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID; int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID; + int HNowSupID = mainList[0].HNowSupID; + int HNowSupTypeID = mainList[0].HNowSupTypeID; @@ -606,7 +608,7 @@ ",HMaterID,HMaterNumber,HMouldType,HUnitID" + ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" + ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" + - ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" + + ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" + ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" + ") " + " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" + @@ -616,7 +618,7 @@ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID + ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" + "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+ - "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" + + "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+ ") "); @@ -732,7 +734,8 @@ int HCaveQty = mainList[0].HCaveQty; int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID; int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID; - + int HNowSupID = mainList[0].HNowSupID; + int HNowSupTypeID = mainList[0].HNowSupTypeID; //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� oCN.BeginTran(); @@ -781,6 +784,8 @@ ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+ ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() + ",HMouldOWNER='" + HMouldOWNER + "'" + + ",HNowSupID="+HNowSupID.ToString()+ + ",HNowSupTypeID="+HNowSupTypeID.ToString()+ ",HProdWeight=" + HProdWeight.ToString() + " where HInterID=" + HInterID.ToString()); diff --git a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs new file mode 100644 index 0000000..29bec74 --- /dev/null +++ b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs @@ -0,0 +1,146 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers.CGGL +{ + public class Cg_PurchaseReturnController : ApiController + { + + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + #region 閲囪喘閫�鏂欏崟 鏌ヨ鍒楄〃 + [Route("Cg_PurchaseReturn/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Kf_PurchaseReturnList " + sWhere, "h_v_Kf_PurchaseReturnList"); + } + else + { + string sql = "select * from h_v_Kf_PurchaseReturnList where 1 = 1 " + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_Kf_PurchaseReturnList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 閲囪喘閫�鏂欏崟 瀹℃牳 鍙嶅鏍� + [Route("Cg_PurchaseReturn/AuditProcessReportList")] + [HttpGet] + public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName) + { + //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍� + //缂栬緫鏉冮檺 + //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犲鏍告潈闄愶紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); + if (lngBillKey == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) + { + if (IsAudit == 1) + { + if (oBill.omodel.HBillStatus == 2) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + string HCheckDate = DateTime.Now.Date.ToString(); + oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1239' and HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + } + else + { + if (oBill.omodel.HBillStatus == 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + string HCheckDate = DateTime.Now.Date.ToString(); + oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1239' and HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒"; + objJsonResult.data = 1; + return objJsonResult; + } + } + + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈壘鍒�"; + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/Kf_ICStockBillMainController.cs b/WebAPI/Controllers/Kf_ICStockBillMainController.cs new file mode 100644 index 0000000..4a03746 --- /dev/null +++ b/WebAPI/Controllers/Kf_ICStockBillMainController.cs @@ -0,0 +1,148 @@ +锘縰sing Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + public class Kf_ICStockBillMainController : ApiController + { + + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + #region 閿�鍞��璐у崟鏌ヨ + [Route("Kf_ICStockBillMain/GetCStockBillList")] + [HttpGet] + public object GetCStockBillList(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_Kf_ICStockBillMain where 1=1", "h_v_IF_Kf_ICStockBillMain"); + } + else + { + string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 瀹℃牳鍙婂弽瀹℃牳 + [Route("Kf_ICStockBillMain/AuditProcessReportList")] + [HttpGet] + public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName) + { + //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍� + //缂栬緫鏉冮檺 + //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, true, CurUserName)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏃犲鏍告潈闄愶紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); + if (lngBillKey == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill(); + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) + { + if (IsAudit == 1) + { + if (oBill.omodel.HBillStatus == 2) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + string HCheckDate = DateTime.Now.Date.ToString(); + oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + } + else + { + if (oBill.omodel.HBillStatus == 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + string HCheckDate = DateTime.Now.Date.ToString(); + oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒"; + objJsonResult.data = 1; + return objJsonResult; + } + } + + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈壘鍒�"; + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs new file mode 100644 index 0000000..54a7fcb --- /dev/null +++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs @@ -0,0 +1,152 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers.SCGL +{ + public class Sc_PackUnionBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛� + private json objJsonResult = new json(); + public DataSet ds = new DataSet(); + public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + public DAL.ClsSc_PackUnionBill BillNew0 = new DAL.ClsSc_PackUnionBill(); // + public DAL.ClsSc_PackUnionBill BillOld0 = new DAL.ClsSc_PackUnionBill(); // + + #region 缁勬墭鍗曞垪琛� + + [Route("Sc_PackUnionBill/Get_PackUnionBillList")] + [HttpGet] + public object GetMateOutBillList(string sWhere) + { + try + { + ds = oCn.RunProcReturn("select * from h_v_PackUnionBillList order by 鏃ユ湡 desc", "h_v_PackUnionBillList"); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region [缁勬墭鍗曞垹闄ゅ姛鑳絔 + /// <summary> + /// 缁勬墭鍗曞垹闄ゅ姛鑳� + /// </summary> + /// <returns></returns> + [Route("Sc_PackUnionBill/set_DeleteBill")] + [HttpGet] + public object set_DeleteBill(string HInterID, string user) + { + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Sc_PackUnionBill", 1, true, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string s = ""; + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); + if (lngBillKey == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + DLL.ClsKf_MateOutBackBill oBill = new DLL.ClsKf_MateOutBackBill(); + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) + { + if (oBill.omodel.HBillStatus > 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = s + "锛屼笉鍏佽鍒犻櫎"; + objJsonResult.data = null; + return objJsonResult; + } + bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo); + if (IsDete) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈壘鍒�"; + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region[缁勬墭鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] + [Route("Sc_PackUnionBill/Sc_PackUnionBillListCheckDetai")] + [HttpGet] + public ApiResult<DataSet> Sc_PackUnionBillListCheckDetai(string HID) + { + if (string.IsNullOrEmpty(HID)) + return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" }; + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + var dataSet = oCN.RunProcReturn("select top 1 * from h_v_PackUnionBillList where hmainid= " + HID + " ", "h_v_PackUnionBillList"); + if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) + return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" }; + + return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet }; + } + #endregion + } +} diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs index 3e0e9a6..93914fa 100644 --- a/WebAPI/Controllers/SellOutController.cs +++ b/WebAPI/Controllers/SellOutController.cs @@ -535,6 +535,7 @@ websLsmain.HEmpID = lsmain[0].HEmpID; websLsmain.HRemark = lsmain[0].HRemark; websLsmain.HMaker = lsmain[0].HMaker; + websLsmain.HKeeperID= lsmain[0].HKeeperID; if (webserver.set_SaveSellOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) { diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs index e36ad10..6385e99 100644 --- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs +++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs @@ -19,7 +19,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; - + #region 杩斿洖閫�璐ч�氱煡鍗曞垪琛� /// <summary> /// 杩斿洖閫�璐ч�氱煡鍗曞垪琛� ///鍙傛暟锛歴tring sql銆� @@ -67,6 +67,8 @@ return objJsonResult; } } + #endregion + #region 鍒犻櫎鍔熻兘 /// <summary> ///鍒犻櫎鍔熻兘 /// </summary> @@ -97,9 +99,9 @@ return objJsonResult; } } + #endregion - // } } \ No newline at end of file diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" index e7e8dd2..14262b3 100644 --- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" +++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.cs" @@ -262,7 +262,7 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - if (sID==null||sID=="") + if (sID == null || sID == "") { sql = string.Format(@"select k.HBarCode 鏉$爜,m.HBillNo 鍣ㄥ叿缂栧彿,s.HName 鐩樼偣鏂规, case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷, @@ -296,9 +296,8 @@ left join Gy_Customer c1 on m.HNowSupID=c1.HItemID left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID - where " + sWhere+ " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID="+sID+") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID="+sID+")"); + where " + sWhere + " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")"); } - ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp"); list.Add(ds.Tables[0]); objJsonResult.code = "0"; diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" index c3d376f..f7ec5a2 100644 --- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" +++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" @@ -142,7 +142,7 @@ string HNumber = list[0].HNumber; string HName = list[0].HName; string HMaker = list[0].HMaker; - + //淇濆瓨 //淇濆瓨瀹屾瘯鍚庡鐞� if (HInterID == 0) @@ -158,7 +158,8 @@ //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.Commit(); } - else { + else + { //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� oCN.BeginTran(); //涓昏〃 @@ -205,7 +206,7 @@ DataSet ds1; try { - + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (string.IsNullOrWhiteSpace(HItemID)) { @@ -236,8 +237,34 @@ } + /// <summary> + /// 淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_ClassTimePrjSub/ModifyByID")] + [HttpPost] + public object Calc(string HEntryID, string HYear, string HPeriod) + { + try + { + oCN.RunProcReturn("exec h_p_Pay_GetAvgMoney " + HYear.ToString() + "," + HPeriod.ToString() + "," + HEntryID.ToString(), "pjgz"); - - + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; + } + } } } \ No newline at end of file diff --git a/WebAPI/DLL/ClsKf_SellOutBackBill.cs b/WebAPI/DLL/ClsKf_SellOutBackBill.cs new file mode 100644 index 0000000..e5dcc15 --- /dev/null +++ b/WebAPI/DLL/ClsKf_SellOutBackBill.cs @@ -0,0 +1,476 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace WebAPI.DLL +{ + public class ClsKf_SellOutBackBill:DBUtility.ClsXt_BaseBill + { + public Model.ClsKf_ICStockBillMain omodel = new Model.ClsKf_ICStockBillMain(); + public List<Model.ClsKf_ICStockBillSub> DetailColl = new List<Model.ClsKf_ICStockBillSub>(); + public List<Model.ClsKf_ICStockBillScheme> DetailSubColl = new List<Model.ClsKf_ICStockBillScheme>(); + + public ClsKf_SellOutBackBill() + { + base.MvarItemKeySub = "Kf_ICStockBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey="Kf_ICStockBillMain"; + base.MvarReportTitle="閿�鍞��搴撳崟"; + base.BillType="1247"; + base.HBillSubType = "1247"; + } + + #region 鍥哄畾浠g爜 + + ~ClsKf_SellOutBackBill() + { + DetailColl = null; + } + + + #endregion 鑷畾涔夋柟娉� + + //鍒犻櫎鍏宠仈 + public override void DeleteRelation(ref string sReturn, Int64 lngBillKey) + { + //閫�璐ч�氱煡鍗� 鍏宠仈鏁伴噺 + try + { + if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�") + { + oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Del " + lngBillKey.ToString()); + } + else + { + + } + } + catch (Exception e) + { + throw (e); + } + } + + //鏂板鍏宠仈 + public override void AddNewRelation(ref string sReturn, Int64 lngBillKey) + { + //閫�璐ч�氱煡鍗� 鍏宠仈鏁伴噺 + try + { + if (omodel.HMainSourceBillType == "閫�璐ч�氱煡鍗�") + { + oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Back_Add " + lngBillKey.ToString()); + } + else + { + + } + } + catch (Exception e) + { + throw (e); + } + } + + //淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + oCn.BeginTran(); + //鏇存柊涓昏〃 + oCn.RunProc("UpDate Kf_ICStockBillMain set " + + //鍥哄畾璧嬪��=============== + " HBillNo='" + omodel.HBillNo + "'" + + ",HDate='" + omodel.HDate + "'" + + ",HYear='" + omodel.HYear.ToString() + "'" + + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + + ",HRemark='" + omodel.HRemark + "'" + + ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" + + ",HUpDateDate=getdate()" + + //======================================== + ",HSellSID=" + omodel.HSellSID.ToString() + + ",HCurID=" + omodel.HCurID.ToString() + + ",HSupID=" + omodel.HSupID.ToString() + + ",HWHID=" + omodel.HWHID.ToString() + + ",HSCWHID=" + omodel.HSCWHID.ToString() + + ",HEmpID=" + omodel.HEmpID.ToString() + + ",HManagerID=" + omodel.HManagerID.ToString() + + ",HSecManagerID=" + omodel.HSecManagerID.ToString() + + ",HKeeperID=" + omodel.HKeeperID.ToString() + + ",HDeptID=" + omodel.HDeptID.ToString() + + ",HExplanation='" + omodel.HExplanation + "'" + + ",HInnerBillNo='" + omodel.HInnerBillNo + "'" + + ",HLinkPhone='" + omodel.HLinkPhone + "'" + + ",HLinkMan='" + omodel.HLinkMan + "'" + + ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" + + ",HConveyMoney=" + omodel.HConveyMoney.ToString() + + ",HConveyCompID=" + omodel.HConveyCompID.ToString() + + ",HConveyTypeID=" + omodel.HConveyTypeID.ToString() + + ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + + " where HInterID=" + lngBillKey.ToString()); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsKf_ICStockBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Kf_ICStockBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" + + ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" + + ",HCostPrice,HCostMoney,HSalePrice" + + ",HEngineNum,HUnderPanNum,HLeaveFactCard" + + ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" + + ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + + "," + oSub.HCostPrice.ToString() + "," + oSub.HCostMoney.ToString() + "," + oSub.HSalePrice.ToString() + + ",'" + oSub.HEngineNum + "','" + oSub.HUnderPanNum + "','" + oSub.HLeaveFactCard + "'" + + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" + + "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" + + ") "); + } + //鏇存柊璁㈠崟鍏宠仈鏁伴噺 + AddNewRelation(ref sReturn, omodel.HInterID); + //鎺у埗鍏宠仈鏁伴噺 + + // + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + + //鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + //寰楀埌mainid + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true); + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID)) + { + omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true); + } + if (IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew)) + { + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + } + // + oCn.BeginTran(); + //涓昏〃 + oCn.RunProc("Insert Into Kf_ICStockBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + + ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID" + + ",HSecManagerID,HSellSID,HCurID" + + ",HLinkMan,HLinkPhone" + + ",HSeOrderBillNo,HConveyCompID,HConveyTypeID,HConveyMoney" + + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + + ") " + + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMainSourceBillType + "'" + + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" + + ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + + "," + omodel.HSecManagerID.ToString() + "," + omodel.HSellSID.ToString() + "," + omodel.HCurID.ToString() + + ",'" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" + + ",'" + omodel.HSeOrderBillNo + "'," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() + + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + + ") "); + //鎻掑叆瀛愯〃 + foreach (Model.ClsKf_ICStockBillSub oSub in DetailColl) + { + oCn.RunProc("Insert into Kf_ICStockBillSub " + + " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" + + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" + + ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" + + ",HCostPrice,HCostMoney,HSalePrice" + + ",HEngineNum,HUnderPanNum,HLeaveFactCard" + + ",HSCSPID,HSPGroupID,HBatchNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" + + ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" + + ") values(" + + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + + "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() + + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + + "," + oSub.HCostPrice.ToString() + "," + oSub.HCostMoney.ToString() + "," + oSub.HSalePrice.ToString() + + ",'" + oSub.HEngineNum + "','" + oSub.HUnderPanNum + "','" + oSub.HLeaveFactCard + "'" + + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" + + "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" + + ") "); + } + //鏇存柊璁㈠崟鍏宠仈鏁伴噺 + AddNewRelation(ref sReturn, omodel.HInterID); + //鎺у埗鍏宠仈鏁伴噺 + + // + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + + //鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds; + Ds = oCn.RunProcReturn("Select * from Kf_ICStockBillMain Where HInterID=" + lngBillKey.ToString(), "Kf_ICStockBillMain"); + if (Ds.Tables[0].Rows.Count == 0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + //鍥哄畾璧嬪��=========================================== + omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]); + omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]); + omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]); + omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]); + omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]); + omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]); + omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]); + omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim(); + omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]); + omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]); + omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]); + omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim(); + omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim(); + omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim(); + omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim(); + omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); + omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim(); + omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim(); + omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim(); + omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim(); + omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim(); + omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim(); + omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]); + omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim(); + omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim(); + //======================================================== + omodel.HSellSID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSellSID"]); + omodel.HCurID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCurID"]); + omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]); + omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]); + omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]); + omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]); + omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]); + omodel.HSecManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSecManagerID"]); + omodel.HKeeperID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HKeeperID"]); + omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]); + omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]); + omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]); + omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]); + omodel.HLinkMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkMan"]); + omodel.HLinkPhone = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLinkPhone"]); + // + omodel.HConveyCompID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HConveyCompID"]); + omodel.HConveyTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HConveyTypeID"]); + omodel.HConveyMoney = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HConveyMoney"]); + omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]); + + //寰幆 + DataSet DsSub; + DsSub = oCn.RunProcReturn("Select * from Kf_ICStockBillSub Where HInterID=" + lngBillKey.ToString(), "Kf_ICStockBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsKf_ICStockBillSub oSub = new Model.ClsKf_ICStockBillSub(); + // 鍥哄畾璧嬪��=============================================== + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]); + oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]); + oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]); + oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]); + oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim(); + //=================================================== + oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]); + oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]); + oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]); + oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]); + oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]); + oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]); + oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]); + oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]); + oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]); + oSub.HSalePrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSalePrice"]); + oSub.HCostMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HCostMoney"]); + oSub.HCostPrice = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HCostPrice"]); + oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]); + oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]); + oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]); + oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]); + oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]); + oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]); + oSub.HEngineNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HEngineNum"]); + oSub.HUnderPanNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HUnderPanNum"]); + oSub.HLeaveFactCard = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLeaveFactCard"]); + oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]); + oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]); + oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]); + oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]); + oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]); + oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]); + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + + //鏄剧ず鍗曟嵁鏉$爜淇℃伅 + public bool ShowBill_Scheme(Int64 lngBillKey, ref string sReturn) + { + try + { + //寰幆瀛愯〃2 + DataSet DsSubSec; + DsSubSec = oCn.RunProcReturn("Select * from Kf_ICStockBillSub_WMS with (nolock) Where HInterID=" + lngBillKey.ToString() + " and HBillType='" + this.BillType + "'", "Kf_ICStockBillSub_WMS"); + DetailSubColl.Clear();//娓呯┖ + for (int i = 0; i < DsSubSec.Tables[0].Rows.Count; i++) + { + Model.ClsKf_ICStockBillScheme oSubSec = new Model.ClsKf_ICStockBillScheme(); + oSubSec.HInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HInterID"].ToString()); + oSubSec.HEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HEntryID"].ToString()); + oSubSec.HItemID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HItemID"].ToString()); + oSubSec.HBillType = DsSubSec.Tables[0].Rows[i]["HBillType"].ToString(); + oSubSec.HMaterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HMaterID"].ToString()); + oSubSec.HProcID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HProcID"].ToString()); + oSubSec.HWhID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HWhID"].ToString()); + oSubSec.HGroupID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HGroupID"].ToString()); + oSubSec.HQty = DBUtility.ClsPub.isDoule(DsSubSec.Tables[0].Rows[i]["HQty"].ToString()); + oSubSec.HBarCode = DsSubSec.Tables[0].Rows[i]["HBarCode"].ToString(); + oSubSec.HAddr = DsSubSec.Tables[0].Rows[i]["HAddr"].ToString(); + oSubSec.HMaker = DsSubSec.Tables[0].Rows[i]["HMaker"].ToString(); + oSubSec.HMakeDate = DBUtility.ClsPub.isDate(DsSubSec.Tables[0].Rows[i]["HMakeDate"].ToString()); + oSubSec.HSourceInterID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceInterID"].ToString()); + oSubSec.HSourceEntryID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceEntryID"].ToString()); + oSubSec.HSourceBillType = DsSubSec.Tables[0].Rows[i]["HSourceBillType"].ToString(); + oSubSec.HSourceBillNo = DsSubSec.Tables[0].Rows[i]["HSourceBillNo"].ToString(); + oSubSec.HSourceItemID = DBUtility.ClsPub.isLong(DsSubSec.Tables[0].Rows[i]["HSourceItemID"].ToString()); + // + DetailSubColl.Add(oSubSec); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + + + #region WMS鏉$爜绋嬪簭 + + //鏉$爜鎵弿璁板綍锛屾柊澧炲埌閿�鍞��搴撳崟 鏃犳簮鍗� + public bool AddBill_PDA_NoSource(ref string sReturn) + { + try + { + //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞� + string s = ""; + int sYear = 0; + int sPeriod = 0; + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(omodel.HDate, ref sYear, ref sPeriod, ref s) == false) + { + sReturn = s; + return false; + } + omodel.HYear = sYear; + omodel.HPeriod = sPeriod; + + DataSet Ds; + oCn.BeginTran(); + //鍒犻櫎涓昏〃 + oCn.RunProc("Delete From Kf_ICStockBillMain where HInterID=" + omodel.HInterID.ToString()); + //鎻掑叆瀛愯〃 + oCn.RunProc("EXEC h_p_Kf_SellOutBackBillSub_Insert_NoSource " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'"); + //鎻掑叆涓昏〃 + oCn.RunProc("Insert Into Kf_ICStockBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" + + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + + ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" + + ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" + + ") " + + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "',convert(varchar(10),getdate(),120),'" + omodel.HMainSourceBillType + "'" + + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',convert(varchar(10),getdate(),120)" + + ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() + + ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + + ") "); + //鏇存柊鍏宠仈鏁伴噺 + + //瀹℃牳鍗曟嵁 + oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + omodel.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + omodel.HInterID.ToString()); + + //鐢熸垚K3鍗曟嵁 + //鏂板瀛愯〃銆佷富琛� + oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_Insert " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillerID.ToString()); + //鍥炲~鍏宠仈鏁伴噺 + oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateBillRelateData " + omodel.HInterID.ToString()); + //瀹℃牳鍗曟嵁 + oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_Check " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString()); + ////鏇存柊搴撳瓨 + oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateStock " + omodel.HInterID.ToString()); + oCn.RunProc("exec h_p_IFK3_ToERP_SellOutBackBill_UpdateOrderStock " + omodel.HInterID.ToString()); + + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + + + + #endregion + + + + + } +} diff --git a/WebAPI/Models/Gy_Mould.cs b/WebAPI/Models/Gy_Mould.cs index 9c3b871..7dd6a0e 100644 --- a/WebAPI/Models/Gy_Mould.cs +++ b/WebAPI/Models/Gy_Mould.cs @@ -61,6 +61,8 @@ public string HMouldOWNER { get; set; } public int HMouldMaintainRuleInterID { get; set; } public int HMouldDotCheckRuleInterID { get; set; } + public int HNowSupID { get; set; } + public int HNowSupTypeID { get; set; } } } \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index ca90ed0..9c76bb2 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,44 +5,44 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-12-25T11:38:33.6784042Z;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> + <History>True|2021-12-28T12:27:30.7445539Z;True|2021-12-28T20:04:07.7342437+08:00;True|2021-12-28T19:48:00.3996948+08:00;True|2021-12-28T19:34:59.2159275+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>12/24/2021 19:55:03</publishTime> + <publishTime>12/28/2021 20:27:00</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>12/24/2021 19:55:03</publishTime> + <publishTime>12/28/2021 20:27:00</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>12/24/2021 19:54:59</publishTime> + <publishTime>12/28/2021 20:26:57</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>12/24/2021 19:54:59</publishTime> + <publishTime>12/28/2021 20:26:57</publishTime> </File> <File Include="bin/Dapper.dll"> - <publishTime>07/22/2016 14:52:40</publishTime> + <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>12/24/2021 19:54:52</publishTime> + <publishTime>12/28/2021 20:26:50</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>12/24/2021 19:54:52</publishTime> + <publishTime>12/28/2021 20:26:50</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/16/2021 17:23:13</publishTime> + <publishTime>12/20/2021 13:19:48</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -51,49 +51,49 @@ <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> - <publishTime>03/18/2015 17:02:50</publishTime> + <publishTime>03/19/2015 01:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> - <publishTime>07/25/2012 11:48:56</publishTime> + <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>12/24/2021 19:54:53</publishTime> + <publishTime>12/28/2021 20:26:51</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>12/24/2021 19:54:53</publishTime> + <publishTime>12/28/2021 20:26:51</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> - <publishTime>08/03/2014 20:33:56</publishTime> + <publishTime>08/04/2014 04:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>12/24/2021 19:54:49</publishTime> + <publishTime>12/28/2021 20:26:47</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>12/24/2021 19:54:49</publishTime> + <publishTime>12/28/2021 20:26:47</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>12/24/2021 19:54:51</publishTime> + <publishTime>12/28/2021 20:26:48</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>12/24/2021 19:54:51</publishTime> + <publishTime>12/28/2021 20:26:48</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>12/24/2021 19:54:51</publishTime> + <publishTime>12/28/2021 20:26:49</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>12/24/2021 19:54:51</publishTime> + <publishTime>12/28/2021 20:26:49</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> - <publishTime>02/15/2015 17:57:08</publishTime> + <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -117,13 +117,13 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> - <publishTime>08/19/2014 10:03:34</publishTime> + <publishTime>08/19/2014 18:03:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> - <publishTime>11/28/2018 13:00:36</publishTime> + <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -132,7 +132,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> - <publishTime>11/28/2018 12:58:44</publishTime> + <publishTime>11/28/2018 20:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -147,37 +147,37 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> - <publishTime>11/28/2018 13:01:26</publishTime> + <publishTime>11/28/2018 21:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> - <publishTime>11/28/2018 13:01:00</publishTime> + <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> - <publishTime>01/28/2015 04:02:18</publishTime> + <publishTime>01/28/2015 12:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> - <publishTime>02/11/2014 15:26:04</publishTime> + <publishTime>02/11/2014 23:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> - <publishTime>01/28/2015 04:02:32</publishTime> + <publishTime>01/28/2015 12:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> - <publishTime>01/28/2015 04:04:30</publishTime> + <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -186,187 +186,187 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> - <publishTime>11/24/2014 11:18:48</publishTime> + <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>12/25/2021 19:38:10</publishTime> + <publishTime>12/28/2021 20:27:05</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/15/2021 17:59:43</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>12/25/2021 19:38:10</publishTime> + <publishTime>12/28/2021 20:27:05</publishTime> </File> <File Include="bin/WebGrease.dll"> - <publishTime>07/17/2013 17:03:52</publishTime> + <publishTime>07/18/2013 01:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> - <publishTime>11/29/2018 13:26:02</publishTime> + <publishTime>11/29/2018 21:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> - <publishTime>11/29/2018 13:26:30</publishTime> + <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:54</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:54</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:54</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>10/29/2021 19:50:53</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Global.asax"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="Index.html"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:55</publishTime> </File> <File Include="packages.config"> - <publishTime>08/16/2021 17:23:16</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/web.config"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>08/16/2021 17:23:15</publishTime> + <publishTime>12/20/2021 13:19:56</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> - <publishTime>12/24/2021 19:55:19</publishTime> + <publishTime>12/28/2021 20:27:28</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index f84ccdb..f3592b7 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -318,6 +318,7 @@ <Compile Include="Controllers\BLL\Xt_UserController.cs" /> <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" /> <Compile Include="Controllers\CellWidthController.cs" /> + <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" /> <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" /> <Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" /> @@ -333,6 +334,7 @@ <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" /> <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" /> <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" /> + <Compile Include="Controllers\Kf_ICStockBillMainController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" /> <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" /> <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" /> @@ -346,6 +348,7 @@ <Compile Include="Controllers\MoveStockBillController.cs" /> <Compile Include="Controllers\Open_PrintTemController.cs" /> <Compile Include="Controllers\ReportStepPlatFormController.cs" /> + <Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" /> @@ -429,6 +432,7 @@ <Compile Include="DLL\ClsGy_WorkTypeBill.cs" /> <Compile Include="DLL\ClsKf_MateOutBackBill.cs" /> <Compile Include="DLL\ClsKf_MateOutBill.cs" /> + <Compile Include="DLL\ClsKf_SellOutBackBill.cs" /> <Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" /> <Compile Include="DLL\ClsOA_InformBill.cs" /> <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> @@ -710,7 +714,9 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> + <Folder Include="Views\Cg_PurchaseReturn\" /> <Folder Include="Views\Gy_EquipType\" /> + <Folder Include="Views\Kf_ICStockBillMain\" /> <Folder Include="Views\MoveStockBill\" /> <Folder Include="Views\QC_Management\" /> <Folder Include="Views\Sc_MouldRepairOutBill\" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index a3179f3..11f569c 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> - <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> @@ -18,9 +18,9 @@ <IISExpressWindowsAuthentication /> <IISExpressUseClassicPipelineMode /> <UseGlobalApplicationHostFile /> - <ProjectView>ShowAllFiles</ProjectView> - <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID> - <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath> + <ProjectView>ProjectFiles</ProjectView> + <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> + <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> </PropertyGroup> <ProjectExtensions> <VisualStudio> -- Gitblit v1.9.1