From 23ccdfdf25eaa33098cd44c9bb802e5cfc65eca4 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期一, 03 四月 2023 10:11:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/HanDianWMSSCM
---
SCM/SCM.csproj | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/SCM/SCM.csproj b/SCM/SCM.csproj
index 3887f7e..cd98d7c 100644
--- a/SCM/SCM.csproj
+++ b/SCM/SCM.csproj
@@ -95,6 +95,39 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Class1.cs" />
+ <Compile Include="绯荤粺绫籠ClsCLD_MaterGroup_View.cs" />
+ <Compile Include="KF_HD_INVENTORYReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="KF_HD_INVENTORYReport.designer.cs">
+ <DependentUpon>KF_HD_INVENTORYReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="绯荤粺绫籠ClsGy_UserMaterGroupRelation_Ctl.cs" />
+ <Compile Include="绯荤粺绫籠ClsGy_UserMaterGroupRelation_Model.cs" />
+ <Compile Include="Form2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form2.Designer.cs">
+ <DependentUpon>Form2.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Gy_UserMaterGroupRelation.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Gy_UserMaterGroupRelation.designer.cs">
+ <DependentUpon>Gy_UserMaterGroupRelation.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃\Kf_SendConfirmationBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃\Kf_SendConfirmationBillList.designer.cs">
+ <DependentUpon>Kf_SendConfirmationBillList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\FrmPrintLabel.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\FrmPrintLabel.Designer.cs">
+ <DependentUpon>FrmPrintLabel.cs</DependentUpon>
+ </Compile>
<Compile Include="鍏敤妯″潡\frmHlpBillList_New.cs">
<SubType>Form</SubType>
</Compile>
@@ -143,6 +176,18 @@
<Compile Include="鍗曟嵁璧勬枡\鍑哄叆搴撳崟鎹甛Kf_SellOutBillList.designer.cs">
<DependentUpon>Kf_SellOutBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReportReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReportReport.designer.cs">
+ <DependentUpon>KF_PonderationBillMain_ICMOReportReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReport.designer.cs">
+ <DependentUpon>KF_PonderationBillMain_ICMOReport.cs</DependentUpon>
+ </Compile>
<Compile Include="鎶ヨ〃\Kf_BarCodeProgressAnalysisReport.cs">
<SubType>Form</SubType>
</Compile>
@@ -154,6 +199,18 @@
</Compile>
<Compile Include="鎶ヨ〃\Kf_ICMOReportAndProdInReport.designer.cs">
<DependentUpon>Kf_ICMOReportAndProdInReport.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_OutList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_OutList.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_OutList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiYiJi.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiYiJi.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_XiYiJi.cs</DependentUpon>
</Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_SNO.cs">
<SubType>Form</SubType>
@@ -543,6 +600,24 @@
<SubType>Designer</SubType>
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Form2.resx">
+ <DependentUpon>Form2.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Gy_UserMaterGroupRelation.resx">
+ <DependentUpon>Gy_UserMaterGroupRelation.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="KF_HD_INVENTORYReport.resx">
+ <DependentUpon>KF_HD_INVENTORYReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃\Kf_SendConfirmationBillList.resx">
+ <DependentUpon>Kf_SendConfirmationBillList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\FrmPrintLabel.resx">
+ <DependentUpon>FrmPrintLabel.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鍏敤妯″潡\frmHlpBillList_New.resx">
<DependentUpon>frmHlpBillList_New.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -575,12 +650,28 @@
<DependentUpon>Kf_SellOutBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReportReport.resx">
+ <DependentUpon>KF_PonderationBillMain_ICMOReportReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃\KF_PonderationBillMain_ICMOReport.resx">
+ <DependentUpon>KF_PonderationBillMain_ICMOReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃\Kf_BarCodeProgressAnalysisReport.resx">
<DependentUpon>Kf_BarCodeProgressAnalysisReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃\Kf_ICMOReportAndProdInReport.resx">
<DependentUpon>Kf_ICMOReportAndProdInReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_OutList.resx">
+ <DependentUpon>Gy_BarCodeBill_OutList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XiYiJi.resx">
+ <DependentUpon>Gy_BarCodeBill_XiYiJi.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_SNO.resx">
@@ -778,6 +869,14 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <COMReference Include="Axgrdes6Lib">
+ <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
+ <VersionMajor>6</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>aximp</WrapperTool>
+ <Isolated>False</Isolated>
+ </COMReference>
<COMReference Include="Axgregn6Lib">
<Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
<VersionMajor>6</VersionMajor>
@@ -786,6 +885,15 @@
<WrapperTool>aximp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
+ <COMReference Include="grdes6Lib">
+ <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
+ <VersionMajor>6</VersionMajor>
+ <VersionMinor>0</VersionMinor>
+ <Lcid>0</Lcid>
+ <WrapperTool>tlbimp</WrapperTool>
+ <Isolated>False</Isolated>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </COMReference>
<COMReference Include="gregn6Lib">
<Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
<VersionMajor>6</VersionMajor>
--
Gitblit v1.9.1