From a472025b76a2b881fc82524a6d62ea81ef309f9f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 12 十一月 2021 13:14:47 +0800
Subject: [PATCH] srm程序修改
---
DAL/采购管理/ClsCg_POInStockBill.cs | 6 ++++--
Model/采购管理/ClsCg_POInStockBillMain.cs | 2 ++
DAL/DAL.csproj | 13 ++++++-------
Model/Model.csproj | 8 ++++----
Model/WMS/ClsGy_MaterialList_WMS_Model.cs | 16 +++++++++++-----
5 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 69e6e50..1a7e1ba 100644
--- a/DAL/DAL.csproj
+++ b/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>
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
index 9fd67d7..7678502 100644
--- "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBill.cs"
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/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)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index e421f6d..83e556d 100644
--- a/Model/Model.csproj
+++ b/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" />
diff --git a/Model/WMS/ClsGy_MaterialList_WMS_Model.cs b/Model/WMS/ClsGy_MaterialList_WMS_Model.cs
index 7879f8b..dc0baf4 100644
--- a/Model/WMS/ClsGy_MaterialList_WMS_Model.cs
+++ b/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; //到期日期
+
+
}
}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillMain.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillMain.cs"
index e0c0041..e775e10 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillMain.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POInStockBillMain.cs"
@@ -18,5 +18,7 @@
public string HExplanation;// varchar(200) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
public string HDHDate; //到货日期
+ public string HDeliveryNo; //物流单号
+
}
}
--
Gitblit v1.9.1