From e015414db93b6cf18489bedcd473e07eef409aea Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 06 六月 2024 15:31:22 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 49a8420..d21e767 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"
@@ -228,6 +228,11 @@
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;
}
@@ -395,6 +400,12 @@
case "1239": //閲囪喘閫�鏂欏崟
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;
@@ -887,7 +898,10 @@
//鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-渚涘簲鍟嗕唬鐮�-鍏綅娴佹按鍙�
LSHlen = 8;//娴佹按鍙锋槸8浣�
- DataSet dataDs = oCN.RunProcReturn($"select b.F_TEZV_BASE from AIS20220308151944..T_PUR_Receive a inner join AIS20220308151944..T_PUR_RECEIVEENTRY b on a.FID = b.FID where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PUR_Receive");
+ 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";
@@ -906,8 +920,13 @@
{
//鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-缁勭粐浠ｇ爜-鍏綅娴佹按鍙�
LSHlen = 8;//娴佹按鍙锋槸8浣�
-
- DataSet dataDs = oCN.RunProcReturn($"select b.F_bsv_Base1,a.FPRDORGID from AIS20220308151944..T_PRD_INSTOCK a inner join AIS20220308151944..T_PRD_INSTOCKENTRY b on a.FID = b.FID where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PRD_INSTOCK");
+ 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";
--
Gitblit v1.9.1