BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DBUtility/基础资料/BillSelect.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WarM/条码打印/Gy_BarCodeBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/DLL/ClsSc_ICMOReportBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
BLL/ϵͳ¹«ÓÃCLS/Cls_S_KF_ICInventoryList_IF.cs
@@ -61,8 +61,8 @@ oSelect.BatchNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[BatchNoCol].Value); oSelect.HAuxPropID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[AuxPropIDCol].Value); oSelect.BillNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[MTONoCol].Value); oSelect.HProduceDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HProduceDateCol].Value); oSelect.HExpiryDate = DBUtility.ClsPub.isDate(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HExpiryDateCol].Value); oSelect.HProduceDate = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HProduceDateCol].Value); oSelect.HExpiryDate = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[HExpiryDateCol].Value); oSelect.BillTitle = mvarReportTitle; oSelect.BillType = mvarItemKey; oBillSelectColl.Add(oSelect); DBUtility/»ù´¡×ÊÁÏ/BillSelect.cs
@@ -14,7 +14,7 @@ public Int64 SPID; public string BatchNo; public Int64 HAuxPropID; public DateTime HProduceDate; //çäº§æ¥æ public DateTime HExpiryDate; //æææè³ public string HProduceDate; //çäº§æ¥æ public string HExpiryDate; //æææè³ } } WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -206,6 +206,10 @@ cmbHBarCodeType.Items.Add("ä»ªå¨æåæ¡ç è§å"); cmbHBarCodeType.Items.Add("è¯åæåæ¡ç è§å"); } else if (sCapName == "䏿§") { cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç "); } else { // @@ -215,20 +219,28 @@ //cmbHBarCodeType.Items.Add("æçæ¡ç "); } // cmbSourceBillType.Items.Add("ç产订å"); cmbSourceBillType.Items.Add("çäº§æ±æ¥å"); cmbSourceBillType.Items.Add("éè´è®¢å"); cmbSourceBillType.Items.Add("æ¶æéç¥å"); cmbSourceBillType.Items.Add("å§å¤è®¢å"); cmbSourceBillType.Items.Add("å·¥åºæ±æ¥å"); cmbSourceBillType.Items.Add("å·¥åºæµè½¬å¡"); cmbSourceBillType.Items.Add("éè´§éç¥å"); cmbSourceBillType.Items.Add("å ¶ä»å ¥åºå"); cmbSourceBillType.Items.Add("ç´æ¥è°æ¨å"); cmbSourceBillType.Items.Add("éè´éæå"); cmbSourceBillType.Items.Add("ç产éæå"); cmbSourceBillType.Items.Add("ç»è£ æå¸å"); //æºåç±»å if (sCapName == "䏿§") { cmbSourceBillType.Items.Add("çäº§æ±æ¥å"); cmbSourceBillType.Items.Add("æ¶æéç¥å"); } else { cmbSourceBillType.Items.Add("ç产订å"); cmbSourceBillType.Items.Add("çäº§æ±æ¥å"); cmbSourceBillType.Items.Add("éè´è®¢å"); cmbSourceBillType.Items.Add("æ¶æéç¥å"); cmbSourceBillType.Items.Add("å§å¤è®¢å"); cmbSourceBillType.Items.Add("å·¥åºæ±æ¥å"); cmbSourceBillType.Items.Add("å·¥åºæµè½¬å¡"); cmbSourceBillType.Items.Add("éè´§éç¥å"); cmbSourceBillType.Items.Add("å ¶ä»å ¥åºå"); cmbSourceBillType.Items.Add("ç´æ¥è°æ¨å"); cmbSourceBillType.Items.Add("éè´éæå"); cmbSourceBillType.Items.Add("ç产éæå"); cmbSourceBillType.Items.Add("ç»è£ æå¸å"); } // DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp); // @@ -754,6 +766,8 @@ int k = 0; Int64 n = 0; //å䏿¹çææ¡ç ä¸çç¬¬å æ¡ string sTMNumber = ""; //æ¡ç èªå®ä¹åç¼ string sSourceBillNo = ""; //æºåå· string sSourceEntryID = ""; //è¡å·ï¼æºååIDï¼ DataSet Ds; //Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH"); //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); @@ -815,6 +829,23 @@ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]); } else if (CampanyName == "䏿§") { sSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value); if (sSourceBillNo == "") { //æ¡ç åç¼ = ç»ç»ä»£ç + ç©æä»£ç + å¹´ + æ + æ¥ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay; Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å· LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]); } else { //æ¡ç = æºååå· + ç©æID + è¡å· sTMNumber = sSourceBillNo + HNumber + sSourceEntryID; } } else //éç¨æ¹æ³ { @@ -957,8 +988,30 @@ } if (cmbHBarCodeType.Text == "å¯ä¸æ¡ç ") { //æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å· TM = sTMNumber + LSH2; if (CampanyName == "䏿§") { if (sSourceBillNo == "") { //æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å· TM = sTMNumber + LSH2; } else { if (HBQty >1) { MessageBox.Show("çäº§æ±æ¥åãæ¶æéç¥åçææ¡ç æ¶ï¼ç®±æ°ä¸è½å¤§äº1ï¼"); bc.Enabled = true; return; } //æ¡ç ç¼å· = æ¡ç åç¼ TM = sTMNumber; } } else { //æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å· TM = sTMNumber + LSH2; } } else if (cmbHBarCodeType.Text == "åºåç ") { @@ -2631,7 +2684,14 @@ } else { grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["æå°å è£ æ°"].ToString(); if (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() == "éè´è®¢å" @@ -3623,11 +3683,20 @@ } else { cmbHBarCodeType.Items.Clear(); cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç "); cmbHBarCodeType.Items.Add("åç§æ¡ç "); cmbHBarCodeType.Items.Add("æ¹æ¬¡æ¡ç "); this.cmbHBarCodeType.SelectedIndex = 0; if (CampanyName == "䏿§") { cmbHBarCodeType.Items.Clear(); cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç "); this.cmbHBarCodeType.SelectedIndex = 0; } else { cmbHBarCodeType.Items.Clear(); cmbHBarCodeType.Items.Add("å¯ä¸æ¡ç "); cmbHBarCodeType.Items.Add("åç§æ¡ç "); cmbHBarCodeType.Items.Add("æ¹æ¬¡æ¡ç "); this.cmbHBarCodeType.SelectedIndex = 0; } } } } WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -2039,5 +2039,53 @@ } #endregion #region 为è¿è¡æäº§çç产订å å表 [Route("Sc_ICMOBill/NotInDayPlan")] [HttpGet] public object Sc_ICMOBillList_NotInDayPlan(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOList_NotInDayPlan where 1 = 1" + sWhere , "h_v_Sc_ICMOList_NotInDayPlan"); if (ds == null && ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Sucessï¼æ²¡ææ¥è¯¢å°ç¸å ³æ°æ®"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } else { //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -202,13 +202,19 @@ ") "); //ååäº§éæ±æ¥å临æ¶è¡¨å ³èåæ®µä¿¡æ¯ string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set HICMOReportInterID ='" + omodel.HInterID + "', HICMOReportBillNo='" + omodel.HBillNo + string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set " + " HICMOReportBillNo ='" + omodel.HBillNo + "', HRelationInterID='" + omodel.HInterID + "', HRelationEntryID='" + oSub.HEntryID + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + DetailColl[0].HICMOBillNo + "' and a.HSourceID='" + DetailColl[0].HSourceID + "' and HICMOInterID='" + DetailColl[0].HICMOInterID + "' and a.HICMOEntryID='" + DetailColl[0].HICMOEntryID + "' and HRelationInterID='0'"); oCn.RunProc(sql); //ååè´¨éæ±æ¥å临æ¶è¡¨å ³èåæ®µä¿¡æ¯ string sql2 = string.Format(@"update Sc_ICMOBillQualityStatus_Tmp set " + " HRelationBillNo ='" + omodel.HBillNo + "', HRelationInterID='" + omodel.HInterID + "' from Sc_ICMOBillQualityStatus_Tmp a where a.HICMOBillNo='" + DetailColl[0].HICMOBillNo + "' and a.HSourceID='" + DetailColl[0].HSourceID + "' and HICMOInterID='" + DetailColl[0].HICMOInterID + "' and a.HICMOEntryID='" + DetailColl[0].HICMOEntryID + "' and HRelationInterID='0'"); oCn.RunProc(sql2); } // //foreach (Model.ClsSc_ICMOReportBillSub oSub in DetailColl) @@ -399,7 +405,6 @@ FentityModel.Add("FMoEntryId", item["FMoEntryId"].ToString());//ç产订ååå½å· FentityModel.Add("FBaseUnitID", new JObject() { ["FNumber"] = item["FBaseUnitID"].ToString() });//åä½ FentityModel.Add("FSTOCKINORGID", new JObject() { ["FNumber"] = item["FSTOCKINORGID"].ToString() });//å ¥åºç»ç» FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOMçæ¬ FentityModel.Add("FOwnerTypeId", item["FOwnerTypeId"].ToString());// 货主类å FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["FOwnerId"].ToString() });// 货主 FentityModel.Add("FSTOCKID", new JObject() { ["FNumber"] = item["FSTOCKID"].ToString() });//ä»åº @@ -420,6 +425,7 @@ FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//åºæ¬åä½å®ææ°é FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//宿æ°é FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//æ¹å· FentityModel.Add("FBOMID", new JObject() { ["FNumber"] = item["FBOMID"].ToString() });// BOMçæ¬ //sJson_BatchNo + //sJson_StockPlace +