王 垚
2021-04-09 25f2835fa45e704f6eccf2feeaa3d2e95c224e2f
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -76,6 +76,7 @@
                if (e.BarItemKey.ToUpper() == "TBCOMPLETE")
                {
                    COMPLETE();
                }
                //提料计划
                if (e.BarItemKey.ToUpper() == "TBEXTRACTION")
@@ -1159,11 +1160,11 @@
            //销售订单号
            string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
            if (!string.IsNullOrEmpty(FSalOrder))
                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
                sqlwhere += $" and FHSeOrderBillNo like '%{FSalOrder}%'";
            //生产订单号
            string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
            if (!string.IsNullOrEmpty(FScOrderMainNo))
                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
                sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
            //物料
            if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
            {
@@ -1279,20 +1280,12 @@
            }
            //销售订单号
            string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
            if (string.IsNullOrEmpty(FSalOrder))
            {
            }
            else
                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
            if (!string.IsNullOrEmpty(FSalOrder))
                sqlwhere += $" and FHSeOrderBillNo like '%{FSalOrder}%'";
            //生产订单号
            string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
            if (string.IsNullOrEmpty(FScOrderMainNo))
            {
            }
            else
                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";
            if (!string.IsNullOrEmpty(FScOrderMainNo))
                sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
            //物料
            if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)