批量确认采购订单,送货单表体新增字段(物流公司,物流单号,到货日期,箱号)
4个文件已修改
46 ■■■■ 已修改文件
DAL/SCM/ClsSup_QuotePriceBill.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/采购管理/ClsCg_POInStockBill.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/采购管理/ClsCg_POOrderBill.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/采购管理/ClsCg_POInStockBillSub.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/SCM/ClsSup_QuotePriceBill.cs
@@ -21,8 +21,8 @@
            base.MvarItemKeySub4 = "";
            base.MvarItemKey="Sup_QuotePriceBillMain";
            base.MvarReportTitle="供应商报价单";
            base.BillType="1507";
            base.HBillSubType = "1507";
            base.BillType= "1121";
            base.HBillSubType = "1121";
        }
        #region å›ºå®šä»£ç 
@@ -123,8 +123,8 @@
                ",HCurID,HExplanation,HInnerBillNo" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HSupID.ToString() + ",'" + omodel.HQuoteEmp + "','" + omodel.HQuoteDept + "','" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMakeDate + "','" + omodel.HMakeDate +
                "'," + omodel.HSupID.ToString() + ",'" + omodel.HQuoteEmp + "','" + omodel.HQuoteDept + "','" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
                ", " + omodel.HPayConditionID.ToString() + "," + omodel.HCurID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
                ") ");
                //插入子表
DAL/²É¹º¹ÜÀí/ClsCg_POInStockBill.cs
@@ -22,21 +22,16 @@
            base.MvarReportTitle = "收料通知单";
            base.BillType = "1103";
            base.HBillSubType = "1103";
        }
        #region å›ºå®šä»£ç 
        ~ClsCg_POInStockBill()
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        public override void DeleteRelation(ref string sReturn, long lngBillKey)
        {
            DataSet Ds = new DataSet();
            Ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBill_UpdateBillRelateData_back " + lngBillKey.ToString(), "H_p_SRM_POInStockBill_UpdateBillRelateData_back");
            if (Ds == null || Ds.Tables[0].Rows.Count == 0)
            {
@@ -48,7 +43,6 @@
                return;
            }
            sReturn = "反写关联数量成功!";
        }
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
@@ -111,13 +105,11 @@
                }
                //
                Ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString(), "H_p_SRM_POInStockBill_UpdateBillRelateData");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "更新关联数量失败!";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 2)
                {
@@ -125,7 +117,6 @@
                    oCn.RollBack();
                    return false;
                }
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
@@ -172,15 +163,16 @@
                      ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HRelationQty,HRelationMoney" +
                      ",HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HWWOrderDetaiLID" +
                      ",HPropertyID,HSecUnitID,HSecUnitRate,HTaxPrice,HTaxMoney,HMainSourceInterID,HBatChNo" +
                      ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD) values("
                      ",HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID,HReturnedQty,HDetailID,F_xbkf_Combo,FSHDD,HExpressNumberSub" +
                      ",HExpressSupplierSub,HPlanArrivalDate,HBoxNumber) values("//
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() +
                      ",'" + oSub.HDate + "','" + oSub.HKFDate + "'," + oSub.HKFPeriod.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HPassQty.ToString() + "," + oSub.HBadQty.ToString() + "," + oSub.HPrice.ToString() +
                      "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HStatus + "," + oSub.HSPID.ToString() + ",'','" + oSub.HEntryCloseDate +
                      "',0,''," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
                      "',0,'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType.ToString() +
                      "'," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HRelationQty + "," + oSub.HRelationMoney +
                      "," + oSub.HWWOrderInterID.ToString() + "," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HWWOrderDetaiLID.ToString() +
                      "," + oSub.HPropertyID.ToString() + ",0," + oSub.HSecUnitRate.ToString() + "," + oSub.HTaxPrice.ToString() + "," + oSub.HTaxMoney.ToString() + "," + oSub.HMainSourceInterID.ToString() + ",'" + oSub.HBatChNo +
                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() + "') ");
                      "'," + oSub.HAuxPropID.ToString() + ",'" + oSub.HMTONo.ToString() + "'," + oSub.HPlanMode + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() + "," + oSub.HReturnedQty.ToString() + "," + oSub.HDetailID.ToString() + ",'" + oSub.F_xbkf_Combo.ToString() + "','" + oSub.FSHDD.ToString() +  "','" + oSub.HExpressNumberSub + "','" + oSub.HExpressSupplierSub + "','" + oSub.HPlanArrivalDate + "','" + oSub.HBoxNumber + "'" + ") ");//物流单号为瑞与琪使用
                }
                //回填关联数量
                //oCn.RunProc("exec H_p_SRM_POInStockBill_UpdateBillRelateData " + omodel.HInterID.ToString());
@@ -200,7 +192,6 @@
                    return false;
                }
                //生成K3单据
                //新增子表、主表
                //oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_Insert " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
@@ -210,13 +201,9 @@
                //oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_Check " + omodel.HInterID.ToString() + "," + omodel.HBillerID.ToString());
                ////更新库存
                //oCn.RunProc("exec h_p_IFK3_ToERP_CGPOInStockBill_RelationInfoCtrl " + omodel.HInterID.ToString());
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
                //
            }
            catch (Exception e)
            {
DAL/²É¹º¹ÜÀí/ClsCg_POOrderBill.cs
@@ -168,8 +168,17 @@
            try
            {
                oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm " + lngBillKey + ",'" + HBillNo + "','" + HUser + "'");
                sReturn = "";
                string[] HBillInter = HBillNo.Split(',');
                foreach (var item in HBillInter)
                {
                    HBillNo = item.Split('@')[0];
                    lngBillKey = long.Parse(item.Split('@')[1]);
                    oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm '" + lngBillKey + "','" + HBillNo + "','" + HUser + "'");
                }
                //oCn.RunProc($@" exec H_p_SRM_POOrderBill_Confirm '{lngBillKey}','{HBillNo}','{HUser}' ");
                //oCn.RunProc(" exec H_p_SRM_POOrderBill_Confirm '" + lngBillKey + "','" + HBillNo + "','" + HUser + "'");
                //sReturn = "";
            }
            catch (Exception e)
            {
Model/²É¹º¹ÜÀí/ClsCg_POInStockBillSub.cs
@@ -46,5 +46,9 @@
        public Int64 HDetailID;
        public string F_xbkf_Combo;
        public string FSHDD;
        public string HExpressNumberSub; //物流单号
        public string HExpressSupplierSub; //物流公司
        public string HPlanArrivalDate; //到货日期
        public string HBoxNumber; //箱号
    }
}