销售订单,发货通知单,退货通知单,销售出库单:表头增加字段：项目编号（HProjectID），界面显示项目编码和项目名称 可选择工程项目为基础资料 ...

zrg

2024-04-18 4fbece886af6bf6df997d7d967888bc72da997ee

销售订单,发货通知单,退货通知单,销售出库单:表头增加字段：项目编号（HProjectID），界面显示项目编码和项目名称
 可选择工程项目为基础资料
 表头和表体增加仓库字段（HWHID）
 选择表头仓库后，表体仓库为空的也自动填充

 DAL/²Ö¿â¹ÜÀí/ClsKf_SellOutBillForLayUI.cs

@@ -187,6 +187,9 @@
                    ",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
                    ",HCarriage = " + omodel.HCarriage + "" +
                    ",HCheckStatusMan = '" + omodel.HCheckStatusMan + "'" +
                    ",HProjectID = '" + omodel.HProjectID.ToString() + "'" +
                     ",HGroupID = '" + omodel.HGroupID.ToString() + "'" +
                    ",HPriceType = '" + omodel.HPriceType + "'" +
                    " where HInterID = " + lngBillKey;
               //更新主表
               oCn.RunProc(mainSql);
@@ -364,7 +367,7 @@
                    ",HDeptID,HManagerID,HEmpID,HSupID,HSecManagerID,HKeeperID,HWHID,HSCWHID,HCurID,HExRate,HSellSID,HLinkMan,HLinkPhone" +
                    ",HSeOrderBillNo" +
                    ",HConveyCompID,HConveyTypeID,HConveyMoney" +
                    ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan" +
                    ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan,HProjectID,HGroupID,HPriceType" +
                    ") " +
                    "values(" +
                    "" + omodel.HInterID.ToString() + "" +
@@ -414,6 +417,9 @@
                    "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "" +
                    "," + omodel.HCarriage + "" +
                    ",'" + omodel.HCheckStatusMan + "'" +
                    ",'" + omodel.HProjectID.ToString() + "'" +
                    ",'" + omodel.HGroupID.ToString() + "'" +
                    ",'" + omodel.HPriceType + "'" +
                    ") ";

                oCn.RunProc(mainSql);

 DAL/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBill.cs

@@ -169,9 +169,9 @@
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                         "','" + oSub.HWhID +
                        "'," + (oSub.HisStockGoods?1:0) +
                        ")";
                         ",'" + oSub.HWhID +
                        "')";
                    oCn.RunProc(subSql);
                }

@@ -385,9 +385,9 @@
                        "','" + oSub.HCusMaterNumber +
                        "','" + oSub.HCusModel +
                        "','" + oSub.HCusMaterName +
                        "','" + oSub.HWhID +
                        "'," + (oSub.HisStockGoods?1:0) +
                        ")";
                        ",'" + oSub.HWhID +
                        "')";
                    oCn.RunProc(subSql);
                }


 DAL/ÏúÊÛ¹ÜÀí/ClsXs_SeOutStockBackBillForLayUI.cs

@@ -89,6 +89,7 @@
                ",HAddress='" + omodel.HAddress + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HProjectID='" + omodel.HProjectID + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                //DeleteRelation(ref sReturn, lngBillKey);
@@ -164,12 +165,12 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                ",HAddress,HSSID,HCusID,HWHID,HCurID,HExRate" +
                ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
                ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HProjectID" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                ",'" + omodel.HAddress + "'," + omodel.HSSID.ToString() + "," + omodel.HCusID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
                ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'"+
                ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','"+omodel.HProjectID.ToString()+"'"+
                ") ");
                //插入子表
                foreach (Model.ClsXs_SeOutStockBackBillSub oSub in DetailColl)

 Model/²Ö¿â¹ÜÀí/ClsKf_SellOutBillMain.cs

@@ -32,6 +32,10 @@
        public string HCheckStatusMan; //核销人
        public double HExRate;          //汇率

        public Int64 HProjectID;    //工程项目
        public Int64 HGroupID;  //班组
        public string HPriceType;   //varchar(20) --单价类型（成本价，结算价）

        public Int64 HOrgID;        //组织
    }
}

 Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOutStockBackBillMain.cs

@@ -17,5 +17,6 @@
        public Int64 HWHID;//   
        public string HExplanation;//  varchar(200)             --ÕªÒª 
        public string HInnerBillNo;//  varchar(50)             --内部单据号
        public Int64 HProjectID;    //工程项目
    }
}

 Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOutStockBillMain.cs

@@ -15,6 +15,7 @@
        public Int64 HCurID;//    int                  --币别 (Gy_Currency)
        public Single HExRate;//    money                  --汇率  (选择完币别带出)
        public Int64 HWHID;//  ä»“库
        public Int64 HProjectID;        //   g工程项目
        public string HExplanation;//  varchar(200)             --ÕªÒª 
        public string HInnerBillNo;//  varchar(50)             --内部单据号
        public Int64 HConveyTypeID;//    è¿è¾“方式

 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs

@@ -287,7 +287,7 @@
                long HConveyCompID = mainList[0].HConveyCompID;//运输公司
                long HConveyMoney = (long)mainList[0].HConveyMoney;//运费
                long HDFflag = Convert.ToInt32(mainList[0].HDFflag); //是否垫付

                long HProjectID = mainList[0].HProjectID;//工程项目

                string HBillType = mainList[0].HBillType;
                string HBillSubType = mainList[0].HBillSubType;
@@ -348,14 +348,14 @@
                        ,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo,HSeOrderBillNo_M
                        ,HConveyTypeID,HConveyCompID,HConveyMoney,HLinkMan,HLinkPhone 
                        ,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
                        ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag)
                        ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag,HProjectID)
                        values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
                    1402 + "','" + HDate + "','" + HBillNo + "'," + HBillStatus + "," + HCusID +
                    "," + HManagerID + "," + HDeptID + ",'" + HRemark + "','" + HMaker + "','" + HMakeDate +
                    "','" + HAddress + "'," + HSSID + "," + HCurID + "," + HWHID + "," + HExRate + "," + HEmpID + ",'" +
                    HExplanation + "','" + HInnerBillNo + "','" + HSeOrderBillNo_M + "','" + HConveyTypeID + "','" + HConveyCompID + "','" + HConveyMoney + "','" + HLinkMan + "','" + HLinkPhone + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
                    + HOWNERTYPEID + "','" + HChecker + "','" + HCheckDate + "','" + HCloseMan + "','" + HCloseDate + "'," + HERPInterID +
                    ",'" + HERPBillType + "'," + HDFflag + ")";
                    ",'" + HERPBillType + "'," + HDFflag + ",'"+ HProjectID + "')";

                    oCN.RunProc(sql);

@@ -366,7 +366,7 @@
                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HCusID='" + HCusID + "', HCurID='" + HCurID + "', HWHID = '" + HWHID
                                 + "',HExRate='" + HExRate + "',HEmpID='" + HEmpID + "',HSeOrderBillNo_M='" + HSeOrderBillNo_M + "',HManagerID='" + HManagerID + "',HDeptID='" + HDeptID + "',HOWNERID='" + HOWNERID
                                 + "',HAddress='" + HAddress + "' where HInterID=" + HInterID;
                                 + "',HAddress='" + HAddress + "',HProjectID='"+ HProjectID + "' where HInterID=" + HInterID;
                    oCN.RunProc(sql);

                    //删除子表