| WarM/条码打印/Gy_CusBarCodeBill_KaiBei_HuaSan.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/条码管理/WEBSController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBill_KaiBei_HuaSan.cs
@@ -71,7 +71,7 @@ public const Int16 HCusModelCol = 49; // public string ModName = "85"; public string ModCaption = "æ°åä¸å®¢æ·æ ç¾çæ"; public string ModCaption = "æ°åä¸ãä¸æ¹éä¿¡ãç»åãç´«å åæºå®¢æ·æ ç¾çæ"; public const string ModRightName = "Gy_CusBarCodeBill_KaiBei_HuaSan"; public DBUtility.ClsPub.Enum_BillStatus BillStatus; @@ -714,6 +714,14 @@ { HBarCodeType = "ä¸æ¹éä¿¡å ç®±ç "; } else if (cmbHCusName.Text.Contains("ç»å")) { HBarCodeType = "ç»åå ç®±ç "; } else if (cmbHCusName.Text.Contains("ç´«å åæº")) { HBarCodeType = "ç´«å åæºå ç®±ç "; } else { HBarCodeType = "æ°åä¸å ç®±ç "; @@ -799,7 +807,7 @@ //æ¡ç åç¼ = 2ä½åºå®ç ï¼'09'ï¼ + CPN客æ·ç¼ç ï¼è§æ ¼åå·ï¼+ 2ä½é¢çç ï¼åºå®'01'ï¼+ 5ä½å¹´å¹´ææ¥æ¥ï¼YYMDDï¼ + 3ä½09ç æµæ°´å·ï¼åºå®'001'ï¼ + ä¾åºå代ç ï¼åºå®'105652'ï¼ sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001105652"; } //æ°åä¸ //æ°åä¸ãç»åãç´«å åæº else { //æ¡ç åç¼ = 2ä½åºå®ç ï¼'09'ï¼ + CPN客æ·ç¼ç ï¼è§æ ¼åå·ï¼+ 2ä½é¢çç ï¼åºå®'01'ï¼+ 5ä½å¹´å¹´ææ¥æ¥ï¼YYMDDï¼ + 3ä½09ç æµæ°´å·ï¼åºå®'001'ï¼ + ä¾åºå代ç ï¼åºå®'151091'ï¼ @@ -839,6 +847,14 @@ if (cmbHCusName.Text.Contains("ä¸æ¹éä¿¡")) { HBarCodeType = "ä¸æ¹éä¿¡å¤ç®±ç "; } else if (cmbHCusName.Text.Contains("ç»å")) { HBarCodeType = "ç»åå¤ç®±ç "; } else if (cmbHCusName.Text.Contains("ç´«å åæº")) { HBarCodeType = "ç´«å åæºå¤ç®±ç "; } else { @@ -926,7 +942,7 @@ private void Display() { //å·æ°å ç®±ç å表 DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å='æ°åä¸å ç®±ç ' or æ¡ç ç±»å='ä¸æ¹éä¿¡å ç®±ç ) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo); DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å in ('æ°åä¸å ç®±ç ','ä¸æ¹éä¿¡å ç®±ç ','ç»åå ç®±ç ','ç´«å åæºå ç®±ç ') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo); //çæé¦è¡æ é¢ if (DSet == null) { @@ -937,7 +953,7 @@ grdSub.DataSource = DSet.Tables[0].DefaultView; //å·æ°å¤ç®±ç å表 DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å='æ°åä¸å¤ç®±ç ' or æ¡ç ç±»å='ä¸æ¹éä¿¡å¤ç®±ç ) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo); DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (æ¡ç ç±»å in ('æ°åä¸å¤ç®±ç ','ä¸æ¹éä¿¡å¤ç®±ç ','ç»åå¤ç®±ç ','ç´«å åæºå¤ç®±ç ') order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo); //çæé¦è¡æ é¢ if (DWSet == null) { @@ -1693,7 +1709,7 @@ { try { oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('æ°åä¸å ç®±ç ','ä¸æ¹éä¿¡å ç®±ç ') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('æ°åä¸å ç®±ç ','ä¸æ¹éä¿¡å ç®±ç ','ç»åå ç®±ç ','ç´«å åæºå ç®±ç ') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); } catch (Exception e) { @@ -1808,7 +1824,7 @@ { try { oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('æ°åä¸å¤ç®±ç ','ä¸æ¹éä¿¡å¤ç®±ç ') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('æ°åä¸å¤ç®±ç ','ä¸æ¹éä¿¡å¤ç®±ç ','ç»åå¤ç®±ç ','ç´«å åæºå¤ç®±ç ') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); } catch (Exception e) { WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -505,42 +505,22 @@ { try { Int64 sHSPID = 0; Int64 sHWhID = 0; if (HBarCode.Contains(";")) //æ¡ç æ ¼å¼='HSP'+ä»åºå ç +';'+ä»ä½å ç if (HBarCode.Contains("HSP") && HBarCode.Contains(";")) { string[] sArray = HBarCode.Replace("HSP", "").Split(';'); sHSPID = DBUtility.ClsPub.isLong(sArray[1]); sHWhID = DBUtility.ClsPub.isLong(sArray[0]); } Int64 sHSPID = 0; Int64 sHWhID = 0; if (HBarCode.Contains(";")) { string[] sArray = HBarCode.Replace("HSP", "").Split(';'); sHSPID = DBUtility.ClsPub.isLong(sArray[1]); sHWhID = DBUtility.ClsPub.isLong(sArray[0]); } if (HWhID == 0) { ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds == null || ds.Tables[0].Rows.Count == 0) if (HWhID == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } else { ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds == null || ds.Tables[0].Rows.Count == 0) { DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds2 == null || ds2.Tables[0].Rows.Count == 0) ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -553,12 +533,56 @@ objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; objJsonResult.data = ds2.Tables[0]; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } else { ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds == null || ds.Tables[0].Rows.Count == 0) { DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); if (ds2 == null || ds2.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; objJsonResult.data = ds2.Tables[0]; return objJsonResult; } } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } } else { ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HBarCode='" + HBarCode + "' and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace"); 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 = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼";
