DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
@@ -14,6 +14,41 @@ //å·²ä¸ä¼ å表çé¢ï¼æ¤éåè½ï¼å é¤WMSè¡¨åæ¬å°åºå ¥åºåè®°å½ï¼å¹¶æ´æ°TEMP表ä¸çä¸ä¼ åæ®µ HRelationInterID=0 public bool DeleteICStockBillAndWMS(Int64 sHInterID, string sHBillNo, string sHBillType, ref string sErrMsg) { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); try { oCn.BeginTran(); DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + sHInterID + ",'" + sHBillNo + "','" + sHBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete"); if (Ds == null || Ds.Tables[0].Rows.Count == 0) { sErrMsg = "æ¤éåæ®å¤±è´¥ï¼æ°æ®åºè¿æ¥å¤±è´¥ï¼"; oCn.RollBack(); return false; } if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0) { sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]); oCn.Commit(); return true; } else { sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]); oCn.RollBack(); return false; } } catch (Exception e) { sErrMsg = e.Message; oCn.RollBack(); return false; } } //夿æ¡ç å ¥åºæ°éæ¯å¦è¶ è¿æ¡ç æ¬èº«é¢å®æ°é public bool IsBarCode(string sBarCode, string sBillType, bool sRedBlueFlag, ref double sQty, ref string sReturn) { DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
@@ -25,6 +25,70 @@ // #region åæ®åè¡¨æ°æ®å¤ç //æ¾ç¤ºç©ææç»åè¡¨ãæ¨¡æ²»å ·å表ãå è¿å åºåè¡¨ä¿¡æ¯ public DataSet GetBillEntry_TmpList(long HInterID, string HBillNo, string HBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg) { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); string sSimpleMode = "N"; //æ¯å¦å¯ç¨æ«ç ç®ææ¨¡å¼ï¼åªæ¾ç¤ºå·²æ«ç æºåè®°å½(Y,N) //è·åç³»ç»åæ° Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); if (oSystemParameter.ShowBill(ref sErrMsg) == false) { sErrMsg = "åæ®å·ï¼" + HBillNo + "ï¼åæ®IDï¼" + HInterID + "ï¼è¿åç©ææç»å表æ¶è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg; return null; } //夿æ¯å¦å¯ç¨å¨å ·ç®¡ç(Y,N) if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //å¯ç¨æ¨¡æ²»å ·ç®¡ç { sMouldManagerCtl = "Y"; } //夿æ¯å¦å¯ç¨å è¿å åºç®¡ç(Y,N)ï¼æ¯å¦å¯ç¨æ«ç ç®ææ¨¡å¼ï¼åªæ¾ç¤ºå·²æ«ç æºåè®°å½(Y,N) if (HBillType == "1204") //çäº§é¢æå { if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y") //çäº§é¢æå-å è¿å åºæ§å¶ { sFIFOCtl = "Y"; } if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //çäº§é¢æå-æ«ç ç®ææ¨¡å¼ { sSimpleMode = "Y"; } } if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y") //éå®åºåºå-å è¿å åºæ§å¶ { sFIFOCtl = "Y"; } if (HBillType == "1211" && oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y") //å§å¤åºåºå-å è¿å åºæ§å¶ { sFIFOCtl = "Y"; } DataSet DS = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList"); return DS; } #endregion public DataSet GetKf_ICStockBillList(string sHBillType, string sHMaker, Int64 sHOWNERID) { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); DataSet Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillList '" + sHBillType + "','" + sHMaker + "'," + sHOWNERID.ToString(), "h_p_Kf_ICStockBillList"); if (Ds == null || Ds.Tables[0].Rows.Count == 0) { return null; } else { return Ds; } } //æ«ææ¡ç è¿ååºå ¥åºæ¡ç 临æ¶è¡¨ä¿¡æ¯ public DataSet GetInfoByID_View(long HInterID, string sBillType, string sWhere) { DAL/Ô´µ¥/Cls_S_Xt_BaseBill.cs
@@ -25,7 +25,8 @@ public string sOrderSql2 = ""; public string sKeyCol2 = ""; public string sShowItemSql2 = ""; public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList(); public frmHlpBillList oFrm; //public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList(); public List<DBUtility.BillSelect> oBillSelectColl = new List<DBUtility.BillSelect>(); public List<DBUtility.BillSelect_A3> oBillSelectColl2 = new List<DBUtility.BillSelect_A3>(); // @@ -53,6 +54,7 @@ tSQL = sWhere + sCondtion + sOrderSql; try { oFrm = new frmHlpBillList(); oFrm.sPrimaryCol = sKeyCol; oFrm.Text = mvarReportTitle; oFrm.lblCaption.Text = mvarReportTitle; @@ -112,6 +114,7 @@ tSQL = sWhere + sCondtion2 + sOrderSql2; try { oFrm = new frmHlpBillList(); oFrm.sPrimaryCol = sKeyCol2; oFrm.Text = mvarReportTitle2; oFrm.lblCaption.Text = mvarReportTitle2; @@ -168,6 +171,7 @@ tSQL = sWhere + sCondtion2 + sOrderSql2; try { oFrm = new frmHlpBillList(); oFrm.sPrimaryCol = sKeyCol2; oFrm.Text = mvarReportTitle2; oFrm.lblCaption.Text = mvarReportTitle2; @@ -257,6 +261,7 @@ tSQL = sWhere + sCondtion + sOrderSql; try { oFrm = new frmHlpBillList(); oFrm.sPrimaryCol = sKeyCol; oFrm.Text = mvarReportTitle; oFrm.lblCaption.Text = mvarReportTitle; @@ -295,6 +300,56 @@ return true; } //æ ¹æ®æºåå· æ¨¡ææ¥è¯¢æ°æ® /// <summary> /// æ¾ç¤ºæ°æ® /// </summary> /// <param name="sWhere">主SQL</param> /// <param name="sCondtion">è¿æ»¤æ¡ä»¶</param> /// <param name="sOrderSql">æåºæ¡ä»¶</param> /// <param name="sKeyCol">ä¸å¯éå¤å</param> /// <returns></returns> public virtual bool RefreshBySourceBillNo(string sWhere) { string sErr = ""; string tSQL; ClsCN oCn = new ClsCN(); tSQL = " select hmainid,hsubid,åæ®å· from " + ViewName + sWhere + sOrderSql; try { DataSet ds = oCn.RunProcReturn(tSQL, ViewName, ref DBUtility.ClsPub.sExeReturnInfo); if (ds == null || ds.Tables[0].Rows.Count == 0) { return false; } //è¿åæ°æ®å°éåä¸ oBillSelectColl.Clear(); //å¾ªç¯ éä¸è¡ for (int i = 0; i < ds.Tables[0].Rows.Count; i++) { BillSelect oSelect = new BillSelect(); oSelect.BillNo = ClsPub.isStrNull(ds.Tables[0].Rows[i]["åæ®å·"]); oSelect.BillMainID = ClsPub.isLong(ds.Tables[0].Rows[i]["hmainid"]); oSelect.BillSubID = ClsPub.isLong(ds.Tables[0].Rows[i]["hsubid"]); oSelect.BillTitle = mvarReportTitle; oSelect.BillType = mvarItemKey; oBillSelectColl.Add(oSelect); } // if (oBillSelectColl.Count > 0) return true; else return false; } catch (Exception e) { sErr = e.Message; } return true; } } } DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cacheBinary files differ
Model/obj/Release/Model.csprojAssemblyReference.cacheBinary files differ
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -1832,7 +1832,14 @@ //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["ç产线代ç "].ToString(); grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["ç产线"].ToString(); grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["计åå®å·¥æ¥æ"].ToString(); grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); if (cmbHBarCodeType.Text == "æ¹æ¬¡æ¡ç " && CampanyName == "åæ¥ç§æ") { grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]); } else { grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); } //-- //设置å¯ç¼è¾å string sAllowCol = HQtyCol.ToString() + @@ -1882,7 +1889,14 @@ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["计éåä½"].ToString(); grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["夿³¨"].ToString(); grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["计åè·è¸ªå·"].ToString(); grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); if (cmbHBarCodeType.Text == "æ¹æ¬¡æ¡ç " && CampanyName == "åæ¥ç§æ") { grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["æªçææ¡ç æ°é"]); } else { grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); } grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName; if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å"|| cmbSourceBillType.Text.Trim() == "éè´è®¢å" || cmbSourceBillType.Text.Trim() == "å§å¤è®¢å" || cmbSourceBillType.Text.Trim() == "éè´å ¥åºå") @@ -2505,6 +2519,106 @@ } } private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e) { if (e.KeyChar == (char)Keys.Return)//åè½¦å¸¦åºæºåä¿¡æ¯ { long sHOrgID = -1; DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View(); if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text)) { sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID; } if (txtHSourceBillNo.Text.Length < 4) { MessageBox.Show("请è¾å ¥4ä½ä»¥ä¸æ°æ®ï¼"); return; } //æ ¹æ®æºåç±»å åæºåå· è·åä¿¡æ¯ if (cmbSourceBillType.Text.Trim() == "ç产订å") { DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList(); if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //éæ©åå { FillSelectData(oIFCLD_ICMOList.oBillSelectColl); txtHSourceBillNo.Text = ""; } else { MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»å䏿ºååå·æ¯å¦æ£ç¡®ï¼"); return; } } else if (cmbSourceBillType.Text.Trim() == "çäº§æ±æ¥å") { DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList(); if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' ")) //éæ©åå { FillSelectData(oIF_ICMOReportBillList.oBillSelectColl); txtHSourceBillNo.Text = ""; } else { MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»å䏿ºååå·æ¯å¦æ£ç¡®ï¼"); return; } } else if (cmbSourceBillType.Text.Trim() == "æ¶æéç¥å") { DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList(); if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' ")) //éæ©åå { FillSelectData(oIF_POInStockBillList.oBillSelectColl); txtHSourceBillNo.Text = ""; } else { MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»å䏿ºååå·æ¯å¦æ£ç¡®ï¼"); return; } } else if (cmbSourceBillType.Text.Trim() == "éè´è®¢å") { DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList(); if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' ")) //éæ©åå { FillSelectData(oIF_POOrderBillList.oBillSelectColl); txtHSourceBillNo.Text = ""; } else { MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»å䏿ºååå·æ¯å¦æ£ç¡®ï¼"); return; } } else if (cmbSourceBillType.Text.Trim() == "å§å¤è®¢å") { DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList(); if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where åæ®å· like '%" + txtHSourceBillNo.Text + "' ")) //éæ©åå { FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl); txtHSourceBillNo.Text = ""; } else { MessageBox.Show("æªæ¥è¯¢å°ä»»å¡æ°æ®ï¼è¯·ç¡®è®¤æéç»ç»ãæºåç±»å䏿ºååå·æ¯å¦æ£ç¡®ï¼"); return; } } else { MessageBox.Show("æéæºåç±»åï¼ä¸æ¯ææ¤åè½ï¼"); return; } } } } } WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.designer.cs
@@ -51,6 +51,8 @@ this.tb = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.gl = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.BatchNo = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.tc = new System.Windows.Forms.ToolStripButton(); this.lblCaption = new System.Windows.Forms.Label(); @@ -67,7 +69,7 @@ this.label1 = new System.Windows.Forms.Label(); this.cmdHEmpID = new System.Windows.Forms.Button(); this.cmdSourceBillNo = new System.Windows.Forms.Button(); this.textBox2 = new System.Windows.Forms.TextBox(); this.txtHSourceBillNo = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); this.cmbSourceBillType = new System.Windows.Forms.ComboBox(); this.label10 = new System.Windows.Forms.Label(); @@ -104,8 +106,6 @@ this.grdSub = new System.Windows.Forms.DataGridView(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.grdList = new System.Windows.Forms.DataGridView(); this.BatchNo = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.Tool.SuspendLayout(); this.P1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit(); @@ -374,6 +374,25 @@ this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.gl.Click += new System.EventHandler(this.gl_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50); // // BatchNo // this.BatchNo.AutoSize = false; this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image"))); this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.BatchNo.ImageTransparentColor = System.Drawing.Color.White; this.BatchNo.Name = "BatchNo"; this.BatchNo.Size = new System.Drawing.Size(36, 47); this.BatchNo.Text = "æ¹æ¬¡"; this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; @@ -438,7 +457,7 @@ this.gbUp.Controls.Add(this.label1); this.gbUp.Controls.Add(this.cmdHEmpID); this.gbUp.Controls.Add(this.cmdSourceBillNo); this.gbUp.Controls.Add(this.textBox2); this.gbUp.Controls.Add(this.txtHSourceBillNo); this.gbUp.Controls.Add(this.label14); this.gbUp.Controls.Add(this.cmbSourceBillType); this.gbUp.Controls.Add(this.label10); @@ -547,13 +566,14 @@ this.cmdSourceBillNo.UseVisualStyleBackColor = true; this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click); // // textBox2 // txtHSourceBillNo // this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.textBox2.Location = new System.Drawing.Point(394, 46); this.textBox2.Name = "textBox2"; this.textBox2.Size = new System.Drawing.Size(166, 21); this.textBox2.TabIndex = 41; this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46); this.txtHSourceBillNo.Name = "txtHSourceBillNo"; this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21); this.txtHSourceBillNo.TabIndex = 41; this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress); // // label14 // @@ -965,25 +985,6 @@ this.grdList.Size = new System.Drawing.Size(929, 288); this.grdList.TabIndex = 46; // // BatchNo // this.BatchNo.AutoSize = false; this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image"))); this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter; this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.BatchNo.ImageTransparentColor = System.Drawing.Color.White; this.BatchNo.Name = "BatchNo"; this.BatchNo.Size = new System.Drawing.Size(36, 47); this.BatchNo.Text = "æ¹æ¬¡"; this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50); // // Gy_BarCodeBill // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1068,7 +1069,7 @@ private System.Windows.Forms.Label label10; private System.Windows.Forms.ComboBox cmbSourceBillType; private System.Windows.Forms.Button cmdSourceBillNo; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox txtHSourceBillNo; private System.Windows.Forms.Label label14; private System.Windows.Forms.ToolStripButton tc; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; WebAPI/Controllers/ProductInController.cs
@@ -165,6 +165,94 @@ } } /// <summary> /// çäº§å ¥åºç¼åå表ç¼è¾æé® è·å表ä½ä¿¡æ¯ /// </summary> /// <param name="HSourceBillNo"></param> /// <returns></returns> [Route("ProdIn/ProdInDetaiNew")] [HttpGet] public object ProdInDetaiNew(string HInterID) { DataSet ds; List<object> list = new List<object>(); string Swhere = ""; try { if (HInterID != "" || HInterID != null) { Swhere = " and hmainid='" + HInterID + "'"; } else { Swhere = HInterID; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åéå®åºåºç¼è¾æ°æ® string sql = "select æ°é HQty,åºæ¶æ°é HQtyMust,ç©æä»£ç HMaterNumber,ç©æåç§° HMaterName,è§æ ¼åå· HMaterModel,æºå主å ç HSourceInterID,æºååå ç HSourceEntryID,æºååå· HSourceBillNo,æ¹æ¬¡ HBatchNo,è¾ å©å±æ§ HAuxPropID,计åè·è¸ªå· HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail"); list.Add(ds.Tables[0]); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.list = list; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } /// <summary> /// è¿å产åå ¥åºæ«ç æç» /// </summary> /// <returns></returns> [Route("ProductIn/DisPlayBarCodeList_Json")] [HttpGet] public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl) { try { ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo); if (ds == null || ds.Tables[3].Rows.Count <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[3]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } [Route("ProductIn/DisBillEntryList_Mate_Webs_Json")] [HttpGet] public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere) @@ -210,6 +298,7 @@ [HttpGet] public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo) { string aa = ""; try { // DataSet ds = new DataSet(); @@ -217,6 +306,7 @@ string sWhere = " Where åæ®å· like '%" + HSourceBillNo.Trim() + "%'"; if (HSourceBillType == "3710") { aa = "æ§è¡äº"; ds = webserver.GetSc_ICMOBillList(sWhere + " "); } if (HSourceBillType == "3711") @@ -227,7 +317,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½,æºåç±»åæé误ï¼"; objJsonResult.Message = "没æè¿åä»»ä½è®°å½,æºåç±»åæé误ï¼"+aa; objJsonResult.data = null; return objJsonResult; ; } WebAPI/Controllers/SellOutController.cs
@@ -64,6 +64,91 @@ } /// <summary> /// éå®åºåºç¼åå表ç¼è¾æé® è·å表ä½ä¿¡æ¯ /// </summary> /// <param name="HSourceBillNo"></param> /// <returns></returns> [Route("SellOut/SellOutDetaiNew")] [HttpGet] public object SellOutDetaiNew(string HInterID) { DataSet ds; List<object> list = new List<object>(); string Swhere = ""; try { if (HInterID != "" || HInterID != null) { Swhere = " and hmainid='" + HInterID + "'"; } else { Swhere = HInterID; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åéå®åºåºç¼è¾æ°æ® string sql = "select æ°é HQty,åºæ¶æ°é HQtyMust,ç©æä»£ç HMaterNumber,ç©æåç§° HMaterName,è§æ ¼åå· HMaterModel,æºå主å ç HSourceInterID,æºååå ç HSourceEntryID,æºååå· HSourceBillNo,æ¹æ¬¡ HBatchNo,è¾ å©å±æ§ HAuxPropID,计åè·è¸ªå· HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail"); list.Add(ds.Tables[0]); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.list = list; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } //å·²ä¸ä¼ åè¡¨å·æ° [Route("Web/DisBillUpdateLoad_Json")] [HttpGet] public object DisBillUpdateLoad_Json(string HBillType, string HMaker, Int64 HOrgID) { try { ds = webserver.GetDisBillUpdateLoad_Json(HBillType, HMaker, HOrgID); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } [Route("SellOut/GetMAXNum")] [HttpGet] public object GetMAXNum() WebAPI/Controllers/WebAPIController.cs
@@ -187,6 +187,45 @@ } //æ¤éç¼ååè¡¨è®°å½ [Route("Web/Rescind_Json")] [HttpGet] public object Rescind_Json(long sHInterID, string sBillNo, string sBillType) { string sErrMsg = string.Empty; try { if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg)) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "å 餿åï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } } catch (Exception) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } } //å é¤ç¼ååè¡¨è®°å½ [Route("Web/Delete_Json")] [HttpGet] WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -18,31 +18,31 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>12/22/2021 13:51:29</publishTime> <publishTime>12/22/2021 22:01:30</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>12/22/2021 13:51:29</publishTime> <publishTime>12/22/2021 22:01:30</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>12/22/2021 13:51:28</publishTime> <publishTime>12/22/2021 22:01:29</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>12/22/2021 13:51:28</publishTime> <publishTime>12/22/2021 22:01:29</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>12/22/2021 13:51:26</publishTime> <publishTime>12/22/2021 22:01:27</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>12/22/2021 13:51:26</publishTime> <publishTime>12/22/2021 22:01:27</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/09/2021 09:06:25</publishTime> <publishTime>12/22/2021 19:58:31</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -60,34 +60,34 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>12/22/2021 13:51:26</publishTime> <publishTime>12/22/2021 22:01:27</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>12/22/2021 13:51:26</publishTime> <publishTime>12/22/2021 22:01:27</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>12/22/2021 13:51:24</publishTime> <publishTime>12/22/2021 22:01:25</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>12/22/2021 13:51:24</publishTime> <publishTime>12/22/2021 22:01:25</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>12/22/2021 13:51:25</publishTime> <publishTime>12/22/2021 22:01:26</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>12/22/2021 13:51:25</publishTime> <publishTime>12/22/2021 22:01:26</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>12/22/2021 13:51:25</publishTime> <publishTime>12/22/2021 22:01:26</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>12/22/2021 13:51:25</publishTime> <publishTime>12/22/2021 22:01:26</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -156,7 +156,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -189,10 +189,13 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>12/22/2021 13:51:31</publishTime> <publishTime>12/22/2021 20:38:25</publishTime> </File> <File Include="bin/WebAPI.dll.config"> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>12/22/2021 13:51:31</publishTime> <publishTime>12/22/2021 20:38:25</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -204,166 +207,166 @@ <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="Content/Site.css"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>10/29/2021 17:42:10</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Global.asax"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="Index.html"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:33</publishTime> </File> <File Include="packages.config"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/web.config"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>08/09/2021 09:06:27</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>08/10/2021 08:30:51</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>08/10/2021 08:30:52</publishTime> <publishTime>12/22/2021 19:58:34</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> <publishTime>12/22/2021 13:51:36</publishTime> <publishTime>12/22/2021 22:01:31</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj
@@ -173,6 +173,10 @@ <HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath> <Private>True</Private> </Reference> <Reference Include="WebAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> <HintPath>bin\WebAPI.dll</HintPath> </Reference> <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath> <Private>True</Private> WebAPI/WebServer.cs
@@ -7832,5 +7832,40 @@ return ds; } #endregion /// <summary> /// è¿åæ«ç æç»ä¿¡æ¯ /// </summary> public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg) { DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View(); return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg); //DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); //return dal.GetInfoByID_View(HInterID, sBillType, sWhere); } //æ¤éç¼åå表é䏿°æ® public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg) { DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl(); if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg)) { sErrMsg = "å 餿åï¼"; return true; } else { sErrMsg = "å é¤å¤±è´¥ï¼"; return false; } } //è¿åç¼åå表已ä¸ä¼ åè¡¨ä¿¡æ¯ public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID) { DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View(); return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID); } } }