This commit is contained in:
PastSaid
2025-01-01 08:21:58 +08:00
parent 9725ab5376
commit 3d15fd4b7e
59 changed files with 3013 additions and 1324 deletions

View File

@@ -18,8 +18,6 @@ namespace GZ.LJY000.Biori.UHIK_PRD_PACKAGE_INSTOCK
[Description("预测单下推组装入库单#"), HotUpdate]
public class BillConvertEventPlugInEx : AbstractConvertPlugIn
{
public override void AfterConvert(AfterConvertEventArgs e)
{
base.AfterConvert(e);
@@ -68,6 +66,7 @@ namespace GZ.LJY000.Biori.UHIK_PRD_PACKAGE_INSTOCK
,ISNULL(t2.生产日期,'') '生产日期'
,ISNULL(t2.有效期至,'') '有效期至'
,ROW_NUMBER() OVER(ORDER BY t0.FSEQ) RN
,ISNULL(t3.RptQty,0) 'RptQty'
FROM #预测单数据 t0
INNER JOIN T_BD_MATERIAL t1 on t1.FMATERIALID = t0.FMATERIALID
INNER JOIN T_BD_MATERIAL_L t1_l on t1_l.FMATERIALID = t0.FMATERIALID AND t1_l.FLOCALEID = 2052
@@ -88,12 +87,22 @@ namespace GZ.LJY000.Biori.UHIK_PRD_PACKAGE_INSTOCK
,ISNULL(CONVERT(varchar(100),t2e.F_UHIK_DATE,20),'') '生产日期',ISNULL(CONVERT(varchar(100),t2e.F_UHIK_DATE1,20),'') '有效期至'
FROM T_PRD_MO t2
INNER JOIN T_PRD_MOENTRY t2e on t2.FID = t2e.FID
INNER JOIN T_PRD_MOENTRY_A t2e_a on t2e.FENTRYID = t2e_a.FENTRYID AND t2e_a.FREQSRC = 2
INNER JOIN T_PRD_MOENTRY_A t2e_a on t2e.FENTRYID = t2e_a.FENTRYID
WHERE 1 = 1 AND t2e.FPackSrcBillNo = t0.FBILLNO AND t2e.FFPackSrcSeq = t0.FSEQ AND t2e.FPackSrcType = 1
AND t2e.FMATERIALID = t0.FMATERIALID
) t2
OUTER APPLY (
SELECT t3e_lk.FSID,SUM(t3e_a.FBASESTOCKINQUASELQTY) RptQty
FROM T_PRD_MORPT t3
INNER JOIN T_PRD_MORPTENTRY t3e on t3.FID = t3e.FID
INNER JOIN T_PRD_MORPTENTRY_A t3e_a on t3e_a.FENTRYID = t3e.FENTRYID
INNER JOIN T_PRD_MORPTENTRY_LK t3e_lk on t3e_lk.FENTRYID = t3e.FENTRYID AND t3e_lk.FSTABLENAME = 'T_PRD_MOENTRY'
WHERE t3e_lk.FSID = t2.MoEntryId
GROUP BY t3e_lk.FSID
) t3
";
var dataList = DBServiceHelper.ExecuteDynamicObject(this.Context, sqlL);
if (dataList != null && dataList.Any())
{
@@ -210,7 +219,8 @@ namespace GZ.LJY000.Biori.UHIK_PRD_PACKAGE_INSTOCK
entry["FFYLQty"] = item["F_FYL_QTY"];
entry["FQty"] = item["FQTY"];
entry["FRptQty"] = item["FQTY"];
//entry["FRptQty"] = item["FQTY"];
entry["FRptQty"] = item["RptQty"];
entry["FNoInStockQty"] = item["FQTY"];
entrys.Add(entry);
@@ -226,11 +236,6 @@ namespace GZ.LJY000.Biori.UHIK_PRD_PACKAGE_INSTOCK
base.OnParseFilterOptions(e);
}
public override void OnParseFilter(ParseFilterEventArgs e)
{
base.OnParseFilter(e);
}
public override void OnInitVariable(InitVariableEventArgs e)
{
base.OnInitVariable(e);