From 7f44db5392fbf212237f59b1b9a3db9f1707803c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 20 六月 2023 09:46:33 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index d5eff85..df85a12 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -213,8 +213,7 @@
HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
- //涓昏〃
- oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ string sql = $"insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
"HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
"HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
" HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
@@ -227,7 +226,11 @@
$" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
$" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
$"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
- $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})");
+ $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})";
+
+ //LogService.Write("sql:" + sql);
+ //涓昏〃
+ oCN.RunProc(sql);
}
else
{
@@ -762,14 +765,14 @@
(
select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
-join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
-join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
+join AIS20230129011339..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
+LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
+join AIS20230129011339..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
) T1
-JOIN AIS20210811135644..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
-LEFT JOIN AIS20210811135644..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
-LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20210811135644..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
-join AIS20210811135644..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
+JOIN AIS20230129011339..T_BD_MATERIAL b on t1.FNUMBER = b.FNUMBER
+LEFT JOIN AIS20230129011339..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
+LEFT join (select distinct fitemid,fformid,FNUMBER from AIS20230129011339..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
+join AIS20230129011339..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
where a.FBASEQTY>0
", "SC_WORKBILLSORTBILLMAIN");
ListInventory = ds.ToModelList<PRD_Inventory>();
@@ -795,10 +798,10 @@
where a.HInterID IN ({0})
group by HICMOEntryID_Sec
) a
-join AIS20210811135644..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
-LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
-LEFT JOIN AIS20210811135644..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID
+join AIS20230129011339..T_PRD_PPBOM T1 on a.FPRDMOENTYID = t1.FMOENTRYID
+LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID
+LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID
+LEFT JOIN AIS20230129011339..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID
) t1
group by FPRDMOENTYID,FMATERIALID
", fDayPlanFids);
@@ -1155,7 +1158,6 @@
}
}
#endregion
-
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鎻愭枡杩愮畻
@@ -1555,14 +1557,14 @@
left join Xt_ORGANIZATIONS o on a.HOrgID=o.HItemID
left join Gy_Supplier s on b.HSupplierID=s.HItemID
where o.HNumber = t5.FNUMBER and s.HNumber = t3.FNUMBER), 0)FFIXLEADTIME
-from AIS20210811135644..t_PUR_POOrder t1
-join AIS20210811135644..t_PUR_POOrderEntry t2 on t1.FID = t2.FID
-join AIS20210811135644..t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
-join AIS20210811135644..T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
-join AIS20210811135644..T_PUR_POORDERENTRY_D tD on t2.FENTRYID = tD.FENTRYID
-join AIS20210811135644..T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
-join AIS20210811135644..T_SEC_user t8 on t1.FCREATORID = t8.FuserId
-join AIS20210811135644..T_BD_DEPARTMENT T7 ON t1.FPURCHASEDEPTID = T7.FDEPTID
+from AIS20230129011339..t_PUR_POOrder t1
+join AIS20230129011339..t_PUR_POOrderEntry t2 on t1.FID = t2.FID
+join AIS20230129011339..t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
+join AIS20230129011339..T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
+join AIS20230129011339..T_PUR_POORDERENTRY_D tD on t2.FENTRYID = tD.FENTRYID
+join AIS20230129011339..T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
+join AIS20230129011339..T_SEC_user t8 on t1.FCREATORID = t8.FuserId
+join AIS20230129011339..T_BD_DEPARTMENT T7 ON t1.FPURCHASEDEPTID = T7.FDEPTID
where t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount>0
and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
@@ -1836,7 +1838,7 @@
long HSettleCurrId = 1;//璐у竵 榛樿鏈湴浜烘皯甯�
var dataSup= oCN.RunProcReturn(@"select * from Gy_Supplier p
- inner join AIS20210811135644..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
+ inner join AIS20230129011339..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='"+ fPrdOrgId + "'", "Gy_Supplier");
long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //渚涘簲鍟�
@@ -1845,7 +1847,7 @@
string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//淇敼浜�
var dataOrg= oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
- inner join AIS20210811135644..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ inner join AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //閲囪喘缁勭粐
@@ -1873,7 +1875,7 @@
i++;
var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
- inner join AIS20210811135644..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
+ inner join AIS20230129011339..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
where FNUMBER='" + _item.FNumber + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Material");
string HMaterID = "0"; //鐗╂枡
string HMaterModel = ""; //鐗╂枡浠ｇ爜
@@ -1895,7 +1897,7 @@
double HFixleadTime = _item.FFIXLEADTIME; // 鎻愬墠鏈�
dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
- inner join AIS20210811135644..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
+ inner join AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
where FNUMBER='" + _item.FORGNumber + "' and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // 閲囪喘缁勭粐
long HPOOrderInterID = _item.PurchseFID; // 閲囪喘璁㈠崟鍐呯爜
@@ -1912,12 +1914,12 @@
string HDayPlanBillNo = _item.FDAYPLANBILLNO; // 鏃ヨ鍒掑伐鍗曞彿
dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
- inner join AIS20210811135644..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ inner join AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
where FNUMBER='" + _item.FWORKSHOPNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
string HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 鐢熶骇杞﹂棿
dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
- inner join AIS20210811135644..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
+ inner join AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // 閲囪喘閮ㄩ棬
--
Gitblit v1.9.1