王 垚
2021-11-12 a472025b76a2b881fc82524a6d62ea81ef309f9f
srm程序修改
5个文件已修改
45 ■■■■■ 已修改文件
DAL/DAL.csproj 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/采购管理/ClsCg_POInStockBill.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/WMS/ClsGy_MaterialList_WMS_Model.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/采购管理/ClsCg_POInStockBillMain.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/DAL.csproj
@@ -10,12 +10,13 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>DAL</RootNamespace>
    <AssemblyName>DAL</AssemblyName>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -51,17 +52,15 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\x86\Debug\DBUtility.dll</HintPath>
    <Reference Include="DBUtility">
      <HintPath>..\..\..\..\LayUI\MES-WEB-API\BLL\bin\Debug\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\DLL\Pub_Class.dll</HintPath>
    </Reference>
    <Reference Include="Pub_Control, Version=1.0.6699.25505, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\x86\Debug\Pub_Control.dll</HintPath>
    <Reference Include="Pub_Control">
      <HintPath>..\..\..\..\LayUI\MES-WEB-API\BLL\bin\Debug\Pub_Control.dll</HintPath>
    </Reference>
    <Reference Include="SQLHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
DAL/²É¹º¹ÜÀí/ClsCg_POInStockBill.cs
@@ -78,6 +78,7 @@
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HDeliveryNo='" + omodel.HDeliveryNo + "'" +
                ",HDHDate='" + omodel.HDHDate + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
@@ -153,12 +154,13 @@
                        "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                        ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                        ",HAddress,HSupID,HCurID,HWHID,HExRate,HDHDate" +
                        ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID,HMainSourceInterID" +
                        ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HDeliveryNo,HMainSourceBillType,HMainSourceBillNo,HMainSourceEntryID,HMainSourceInterID" +
                        ",HBillStatus,HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HBacker,HBackDate) " +
                        " 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.HAddress + "'," + omodel.HSupID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HExRate.ToString() + ",'" + omodel.HDHDate + "'" +
                        ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID +
                        ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HDeliveryNo + "','" + omodel.HMainSourceBillType + "','" + omodel.HMainSourceBillNo + "'," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID +
                        "," + omodel.HBillStatus + "," + omodel.HCheckItemNowID + "," + omodel.HCheckItemNextID + "," + omodel.HCheckFlowID + ",'','" + omodel.HBackDate + "') ");
                //插入子表        
                foreach (Model.ClsCg_POInStockBillSub oSub in DetailColl)
Model/Model.csproj
@@ -10,12 +10,13 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Model</RootNamespace>
    <AssemblyName>Model</AssemblyName>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>2.0</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -51,9 +52,8 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\NETERP\bin\x86\Debug\DBUtility.dll</HintPath>
    <Reference Include="DBUtility">
      <HintPath>..\..\..\..\LayUI\MES-WEB-API\BLL\bin\Debug\DBUtility.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
Model/WMS/ClsGy_MaterialList_WMS_Model.cs
@@ -4,18 +4,22 @@
namespace Model
{
    public class ClsGy_MaterialList_WMS_Model
    public class ClsGy_MaterialList_WMS_Model
    {
         //
        //
        public Int64 HItemID;//        int(标识列)     //
        //public string HBarCode;//    varchar(50)(聚集索引)  //条码编号    
        public string HBatchNo;//   varchar(50)  //批次号
        public Int64 HMaterID;//   int         //对应物料
        public string HMaterNumber;//   int         //物流编码
        public string HMaterName;//   int         //物料名称
        public string HMaterModel;//   int         //规格型号
        public Int64 HUnitID;//        int    //计量单位
        public string HBarCodeType;
        public double HQty ;//      dec(18,8)      //数量
        public Int64 HSupID ;//    int         //往来单位
        public Int64 HGroupID ;//    int     //生产班组
        public double HQty;//      dec(18,8)      //数量
        public Int64 HSupID;//    int         //往来单位
        public string HSupName;
        public Int64 HGroupID;//    int     //生产班组
        public string HMaker;//    varchar(20)    //制作人
        public DateTime HMakeDate;//    datetime // åˆ¶ä½œæ—¥æœŸ
        public string HRemark;//        varchar(50)    //备注
@@ -35,5 +39,7 @@
        public string HKFDate;              //生产日期
        public Int64 HKFPeriod;            //保质期
        public string HKFDQDate;            //到期日期
    }
}
Model/²É¹º¹ÜÀí/ClsCg_POInStockBillMain.cs
@@ -18,5 +18,7 @@
        public string HExplanation;//  varchar(200)             --ÕªÒª 
        public string HInnerBillNo;//  varchar(50)             --内部单据号
        public string HDHDate; //到货日期
        public string HDeliveryNo; //物流单号
    }
}