From 2095d4d4920f16a8b493c80bada80db5cedc8c31 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 23 一月 2024 14:45:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/WarM.csproj | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 3cb280f..a474da8 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -123,6 +123,12 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_MESNowWorkBill_Fast.designer.cs">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
+ </Compile>
<Compile Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.cs">
<SubType>Form</SubType>
</Compile>
@@ -387,6 +393,12 @@
<Compile Include="浠撳簱绠＄悊\Kf_StockInRequestBillList.designer.cs">
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
</Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.designer.cs">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ </Compile>
<Compile Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.cs">
<SubType>Form</SubType>
</Compile>
@@ -555,24 +567,6 @@
<Compile Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterOut_M.designer.cs">
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
</Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.designer.cs">
- <DependentUpon>Sc_QLKB.cs</DependentUpon>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.designer.cs">
- <DependentUpon>Sc_CJKB.cs</DependentUpon>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.designer.cs">
- <DependentUpon>Sc_CGKB.cs</DependentUpon>
- </Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.cs">
<SubType>Form</SubType>
</Compile>
@@ -699,6 +693,24 @@
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.designer.cs">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.designer.cs">
+ <DependentUpon>Kf_WeighToBarCode.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.cs">
<SubType>Form</SubType>
</Compile>
@@ -745,6 +757,10 @@
</EmbeddedResource>
<EmbeddedResource Include="Kf_BillDatePeriod.resx">
<DependentUpon>Kf_BillDatePeriod.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_MESNowWorkBill_Fast.resx">
+ <DependentUpon>Sc_MESNowWorkBill_Fast.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="浠撳簱绠＄悊\Gy_BarCodeBill_ChaiMa.resx">
@@ -922,6 +938,10 @@
<DependentUpon>Kf_StockInRequestBillList.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="浠撳簱绠＄悊\Kf_SellOutBill_BarCodeNote.resx">
+ <DependentUpon>Kf_SellOutBill_BarCodeNote.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_OtherStockInCheckCount.resx">
<DependentUpon>CH_OtherStockInCheckCount.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -940,9 +960,6 @@
</EmbeddedResource>
<EmbeddedResource Include="瀛樿揣鏍哥畻\CH_RedStockOutCheckCount.resx">
<DependentUpon>CH_RedStockOutCheckCount.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Kf_BarCodeBackInfoReport_MaterInOut_BatchNo_M.resx">
@@ -1038,18 +1055,6 @@
<DependentUpon>Kf_BarCodeBackInfoReport_MaterOut_M.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_QLKB.resx">
- <DependentUpon>Sc_QLKB.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_CJKB.resx">
- <DependentUpon>Sc_CJKB.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_CGKB.resx">
- <DependentUpon>Sc_CGKB.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeStatusQueryReport.resx">
<DependentUpon>WMS_BarCodeStatusQueryReport.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -1133,6 +1138,18 @@
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
+ <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode_StationOutBill.resx">
+ <DependentUpon>Kf_WeighToBarCode_StationOutBill.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Kf_WeighToBarCode.resx">
+ <DependentUpon>Kf_WeighToBarCode.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Sc_ICMOToBarCode.resx">
<DependentUpon>Sc_ICMOToBarCode.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1