From 179a5764f06f36e8d0901d5c1b8ac85804920db9 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期四, 21 十一月 2024 16:54:24 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 151 insertions(+), 10 deletions(-) diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" index a788ec6..7875f1c 100644 --- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" +++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" @@ -69,7 +69,7 @@ } else { - list.Add(""); + list.Add(CampanyName); } objJsonResult.code = "1"; objJsonResult.count = 1; @@ -127,6 +127,10 @@ list.Add("浠櫒鎴愬搧鏉$爜瑙勫垯"); list.Add("璇曞墏鎴愬搧鏉$爜瑙勫垯"); } + else if (sCapName == "娣诲悍绉戞妧") + { + list.Add("鎵规鏉$爜"); + } else { list.Add("鍞竴鏉$爜"); @@ -156,6 +160,7 @@ [HttpGet] public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID) { + oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo); List<object> columnNameList = new List<object>(); try { @@ -191,8 +196,16 @@ break; case "鏀舵枡閫氱煡鍗�": tabname = "h_v_IF_POInStockBillList_Source"; - count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; - sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); + if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�") + { + count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; + sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); + } + else + { + count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; + sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); + } break; case "濮斿璁㈠崟": tabname = "h_v_IF_EntrustOrderBillList_Source"; @@ -218,6 +231,11 @@ tabname = "h_v_IF_MateOutBackBillList_Source"; count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); + break; + case "宸ュ簭娴佽浆鍗�": + tabname = "h_v_IF_ProcessExchangeBillList_Source"; + count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count; + sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)"); break; default: break; @@ -387,6 +405,12 @@ break; case "1255": //缁勮鎷嗗嵏鍗� break; + case "3772": //宸ュ簭娴佽浆鍗� + //寰楀埌淇℃伅 + ds = oCN.RunProcReturn("select * from h_v_IF_ProcessExchangeList where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList", ref DBUtility.ClsPub.sExeReturnInfo); + //鍐欏叆淇℃伅 + ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType)); + break; default: break; } @@ -411,6 +435,7 @@ public object HSourceOrderList(DataTable dt, HSouceOrderList ordrlist,string HBarCodeType) { + oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo); for (int i = 0; i < dt.Rows.Count; i++) { ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString(); @@ -447,6 +472,17 @@ ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString(); ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡 ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString(); + + if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤 + { + ordrlist.HGroupID = Convert.ToInt32(dt.Rows[i]["HBeginWorkGroupID"]); + ordrlist.HGroupNumber = dt.Rows[i]["寮�宸ョ彮缁勪唬鐮�"].ToString(); + ordrlist.HGroupName = dt.Rows[i]["寮�宸ョ彮缁勫悕绉�"].ToString(); + ordrlist.HEmpID = Convert.ToInt32(dt.Rows[i]["HBeginWorkEmpID"]); + ordrlist.HEmpNumber = dt.Rows[i]["寮�宸ヤ汉浠g爜"].ToString(); + ordrlist.HEmpName = dt.Rows[i]["寮�宸ヤ汉鍚嶇О"].ToString(); + } + if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�") { ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString(); @@ -465,6 +501,7 @@ public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType) { + oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo); for (int i = 0; i < dt.Rows.Count; i++) { ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString(); @@ -491,9 +528,12 @@ if(HSourceBillType == "鏀舵枡閫氱煡鍗�") { - ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString(); - ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString(); - ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString(); + if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�") + { + ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString(); + ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString(); + ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString(); + } } if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�") @@ -795,6 +835,12 @@ decimal HAuxQty = 0; string HheatNO = ""; + Int64 HGroupID = 0; + long HEmpID = 0; + string HCusModel = ""; //瀹㈡埛鐗╂枡瑙勬牸 + string HCusMaterName = ""; //瀹㈡埛鐗╂枡鍚嶇О + string HCheckEmpName = ""; //妫�楠屽憳鍚嶇О + DataSet Ds; msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n @@ -813,6 +859,11 @@ HFactory = ClsPub.isStrNull(ordrlist[j].HFactory); HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty); HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO); + HGroupID = ClsPub.isInt(ordrlist[j].HGroupID); + HEmpID = ClsPub.isLong(ordrlist[j].HEmpID); + HCusModel = ClsPub.isStrNull(ordrlist[j].HCusModel); + HCusMaterName = ClsPub.isStrNull(ordrlist[j].HCusMaterName); + HCheckEmpName = ClsPub.isStrNull(ordrlist[j].HCheckEmpName); //鏃ユ湡鑾峰彇鏂瑰紡 sDate = DateTime.Now.ToString(); // @@ -825,6 +876,10 @@ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate); } else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉$爜鏃ユ湡 + { + sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate); + } + else if (CampanyName == "涔濊彵")// 鏃ユ湡锛氱敓浜ц鍗� 鏉$爜鏃ユ湡 { sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate); } @@ -866,6 +921,72 @@ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); + } + else if (CampanyName == "鐟炰笌绁�") { + var date = DateTime.Now.ToString("yyMMdd");//鏃ユ湡 + if (HSourceBillTypeName == "鏀舵枡閫氱煡鍗�") + { + //鐗╂枡浠g爜-鍖呰鏍囪瘑-鏃ユ湡-渚涘簲鍟嗕唬鐮�-鍏綅娴佹按鍙� + LSHlen = 8;//娴佹按鍙锋槸8浣� + + DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_TEZV_BASE from AIS20220308151944..T_PUR_Receive a +inner join AIS20220308151944..T_PUR_RECEIVEENTRY b on a.FID = b.FID +left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_TEZV_BASE=pr.FID +where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PUR_Receive"); + if (dataDs.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒"; + return objJsonResult; + } + + sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_TEZV_BASE"].ToString() + "-" + date + "-" + ordrlist[j].HSupNumber + "-"; + + //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-" + date + "-" + ordrlist[j].HSupNumber + "-"; + Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 + LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); + } + else if (HSourceBillTypeName == "鐢熶骇鍏ュ簱鍗�") + { + //鐗╂枡浠g爜-鍖呰鏍囪瘑-鏃ユ湡-缁勭粐浠g爜-鍏綅娴佹按鍙� + LSHlen = 8;//娴佹按鍙锋槸8浣� + DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_bsv_Base1,a.FPRDORGID from AIS20220308151944..T_PRD_INSTOCK a +inner join AIS20220308151944..T_PRD_INSTOCKENTRY b on a.FID = b.FID +join( +select HERPInterID, HERPEntryID, HInterID, HEntryID from Kf_ICStockBillSub +)kf on b.FID = kf.HERPInterID and b.FENTRYID = kf.HERPEntryID +left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_bsv_Base1=pr.FID +where kf.HInterID = {ordrlist[j].HMainID} and kf.HEntryID = {ordrlist[j].HSubID}", "T_PRD_INSTOCK"); + if (dataDs.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒"; + return objJsonResult; + } + string RQHNumber = ""; + if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100014")//姹熻嫃 + { + RQHNumber = "1.07.008"; + } + else if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100012")//涓婃捣 + { + RQHNumber = "1.04.008"; + } + + sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_bsv_Base1"].ToString() + "-" + date + "-" + RQHNumber + "-"; + + //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-"+ date + "-缁勭粐浠g爜-"; + Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 + LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); + } + else + { + sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay; + Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 + LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); + } } else //閫氱敤鏂规硶 { @@ -1093,6 +1214,12 @@ barcode.HFactory = ordrlist[j].HFactory; barcode.HAuxQty = ordrlist[j].HAuxQty; barcode.HheatNO = ordrlist[j].HheatNO; + + barcode.HGroupID2 = ordrlist[j].HGroupID; + barcode.HEmpID2 = ordrlist[j].HEmpID; + barcode.HCusModel2 = ordrlist[j].HCusModel; + barcode.HCusMaterName2 = ordrlist[j].HCusMaterName; + barcode.HCheckEmpName2 = ordrlist[j].HCheckEmpName; ListRows.Add(barcode); k = k + 1; n = n + 1; @@ -1109,7 +1236,7 @@ double HQty2 = 0; string HBatchNo2 = ""; Int64 HSupID = 0; - Int64 HGroupID = 0; + Int64 HGroupID2 = 0; int HPrintQty = 0; Int64 HSourceInterID = 0; Int64 HSourceEntryID = 0; @@ -1141,6 +1268,11 @@ string HheatNO2 = ""; DateTime HProduceDate; DateTime HExpiryDate; + long HEmpID2 = 0; + string HCusModel2 = ""; + string HCusMaterName2 = ""; + string HCheckEmpName2 = ""; + try { oCN.BeginTran(); @@ -1155,6 +1287,10 @@ if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒") { HBarCodeType = "鍞竴鏉$爜"; + } + if (CampanyName == "涔濊彵") + { + HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2); } // HMaterID = ClsPub.isLong(ListRows[i].HMaterID2); @@ -1193,6 +1329,11 @@ HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO); HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate); HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate); + HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2); + HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2); + HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2); + HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2); + HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2); oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" + ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " + @@ -1201,16 +1342,16 @@ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " + ",HGiveAwayFlag " + ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" + - ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " + + ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName " + ") values (" + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString() - + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString() + + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString() + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'" + ", " + 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() + "," + HEntryID.ToString() + "" + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) - + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")"); + + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "'" + ")"); //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value); -- Gitblit v1.9.1