From 06e404fe295d6433246cd95cef5eb04797b4f8bd Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 11 十二月 2025 10:37:31 +0800
Subject: [PATCH] 1、克重逻辑修改
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 217 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d0345de..35de312 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -209,6 +209,12 @@
<Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
<DependentUpon>Frm_Department.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.Designer.cs">
+ <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
<SubType>Form</SubType>
</Compile>
@@ -491,6 +497,19 @@
<Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
<DependentUpon>SetLB.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\MJGL\Frm_MesMoldArchives.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\MJGL\Frm_MesMoldArchives.Designer.cs">
+ <DependentUpon>Frm_MesMoldArchives.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\MJGL\Frm_MesMoldManagement.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\MJGL\Frm_MesMoldManagement.Designer.cs">
+ <DependentUpon>Frm_MesMoldManagement.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\MJGL\Models\MesMoldArchives.cs" />
<Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
<SubType>Form</SubType>
</Compile>
@@ -617,6 +636,24 @@
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.Designer.cs">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.Designer.cs">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.Designer.cs">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\JyxmShowCopy.cs">
<SubType>Form</SubType>
</Compile>
@@ -740,6 +777,12 @@
<Compile Include="DevFrm\RkQC\SelectCqsq.Designer.cs">
<DependentUpon>SelectCqsq.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemArnDt.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemArnDt.Designer.cs">
+ <DependentUpon>Frm_MesInvItemArnDt.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
<SubType>Form</SubType>
</Compile>
@@ -793,6 +836,36 @@
</Compile>
<Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs">
<DependentUpon>CkYtmx.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\gdwldcqtkc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\gdwldcqtkc.Designer.cs">
+ <DependentUpon>gdwldcqtkc.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\wlhzdcqtkc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\wlhzdcqtkc.Designer.cs">
+ <DependentUpon>wlhzdcqtkc.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\SysTuiSong.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
+ <DependentUpon>SysTuiSong.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.Designer.cs">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.Designer.cs">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\YS_iqcWeek.cs">
<SubType>Form</SubType>
@@ -895,6 +968,12 @@
</Compile>
<Compile Include="DevFrm\Rpt\YS_jhdcl.Designer.cs">
<DependentUpon>YS_jhdcl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjlMax .cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\YS_mjczjlMax .Designer.cs">
+ <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\YS_mjczjl.cs">
<SubType>Form</SubType>
@@ -1227,6 +1306,30 @@
<Compile Include="DevFrm\Warehouse\Models\MesDepotSections.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutCDetails.cs" />
<Compile Include="DevFrm\Warehouse\Models\MesInvItemOutItems.cs" />
+ <Compile Include="DevFrm\WOM\FrmMaterialType.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmMaterialType.Designer.cs">
+ <DependentUpon>FrmMaterialType.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmMaterialWarehouse.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmMaterialWarehouse.Designer.cs">
+ <DependentUpon>FrmMaterialWarehouse.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmWorkshopPickingMethod.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmWorkshopPickingMethod.Designer.cs">
+ <DependentUpon>FrmWorkshopPickingMethod.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmMaterialMaintenance.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\FrmMaterialMaintenance.Designer.cs">
+ <DependentUpon>FrmMaterialMaintenance.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WOM\FrmBackFlash.cs">
<SubType>Form</SubType>
</Compile>
@@ -1238,6 +1341,12 @@
</Compile>
<Compile Include="DevFrm\WOM\Frm_MesScrkDj.Designer.cs">
<DependentUpon>Frm_MesScrkDj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_MesScrksqDj.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_MesScrksqDj.Designer.cs">
+ <DependentUpon>Frm_MesScrksqDj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.cs">
<SubType>Form</SubType>
@@ -1305,6 +1414,18 @@
<Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WW\Frm_Wwgdhb.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\Frm_Wwgdhb.Designer.cs">
+ <DependentUpon>Frm_Wwgdhb.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WW\SelectWwgd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\SelectWwgd.Designer.cs">
+ <DependentUpon>SelectWwgd.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WW\showWwZhongTai.cs">
<SubType>Form</SubType>
</Compile>
@@ -1351,6 +1472,18 @@
</Compile>
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.Designer.cs">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcCheckFlow.cs">
<SubType>UserControl</SubType>
@@ -1626,11 +1759,23 @@
<Compile Include="UserControl\UcLookHuoZhu.Designer.cs">
<DependentUpon>UcLookHuoZhu.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookItemstype.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookItemstype.Designer.cs">
+ <DependentUpon>UcLookItemstype.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookItems.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserControl\UcLookItems.Designer.cs">
<DependentUpon>UcLookItems.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookKw.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookKw.Designer.cs">
+ <DependentUpon>UcLookKw.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookOrg.cs">
<SubType>UserControl</SubType>
@@ -1734,17 +1879,14 @@
<Compile Include="XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
- <Compile Include="XtraForm2.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="XtraForm2.Designer.cs">
- <DependentUpon>XtraForm2.cs</DependentUpon>
- </Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
<DependentUpon>Frm_Department.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepotMin.resx">
+ <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
@@ -1888,6 +2030,12 @@
<EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
<DependentUpon>SetLB.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\MJGL\Frm_MesMoldArchives.resx">
+ <DependentUpon>Frm_MesMoldArchives.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\MJGL\Frm_MesMoldManagement.resx">
+ <DependentUpon>Frm_MesMoldManagement.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
<DependentUpon>Frm_AreaBind.cs</DependentUpon>
</EmbeddedResource>
@@ -1933,8 +2081,17 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.resx">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmByLeiBie.resx">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShow.resx">
<DependentUpon>JyxmShow.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmShowByLeiBie.resx">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShowCopy.resx">
<DependentUpon>JyxmShowCopy.cs</DependentUpon>
@@ -1984,6 +2141,9 @@
<EmbeddedResource Include="DevFrm\RkQC\SelectCqsq.resx">
<DependentUpon>SelectCqsq.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemArnDt.resx">
+ <DependentUpon>Frm_MesInvItemArnDt.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
<DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
</EmbeddedResource>
@@ -2010,6 +2170,21 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx">
<DependentUpon>CkYtmx.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\gdwldcqtkc.resx">
+ <DependentUpon>gdwldcqtkc.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\wlhzdcqtkc.resx">
+ <DependentUpon>wlhzdcqtkc.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
+ <DependentUpon>SysTuiSong.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtdj.resx">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtrkdj.resx">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_iqcWeek.resx">
<DependentUpon>YS_iqcWeek.cs</DependentUpon>
@@ -2061,6 +2236,9 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_jhdcl.resx">
<DependentUpon>YS_jhdcl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjlMax .resx">
+ <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_mjczjl.resx">
<DependentUpon>YS_mjczjl.cs</DependentUpon>
@@ -2222,11 +2400,26 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesShouTuiDj.resx">
<DependentUpon>Frm_MesShouTuiDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\FrmMaterialType.resx">
+ <DependentUpon>FrmMaterialType.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\FrmMaterialWarehouse.resx">
+ <DependentUpon>FrmMaterialWarehouse.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\FrmWorkshopPickingMethod.resx">
+ <DependentUpon>FrmWorkshopPickingMethod.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\FrmMaterialMaintenance.resx">
+ <DependentUpon>FrmMaterialMaintenance.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\FrmBackFlash.resx">
<DependentUpon>FrmBackFlash.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_MesScrkDj.resx">
<DependentUpon>Frm_MesScrkDj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrksqDj.resx">
+ <DependentUpon>Frm_MesScrksqDj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
@@ -2261,6 +2454,12 @@
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\Frm_Wwgdhb.resx">
+ <DependentUpon>Frm_Wwgdhb.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\SelectWwgd.resx">
+ <DependentUpon>SelectWwgd.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
</EmbeddedResource>
@@ -2281,6 +2480,12 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintAll.resx">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
+ <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcCheckFlow.resx">
<DependentUpon>UcCheckFlow.cs</DependentUpon>
@@ -2417,8 +2622,14 @@
<EmbeddedResource Include="UserControl\UcLookHuoZhu.resx">
<DependentUpon>UcLookHuoZhu.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookItemstype.resx">
+ <DependentUpon>UcLookItemstype.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookItems.resx">
<DependentUpon>UcLookItems.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookKw.resx">
+ <DependentUpon>UcLookKw.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookOrg.resx">
<DependentUpon>UcLookOrg.cs</DependentUpon>
@@ -2470,9 +2681,6 @@
</EmbeddedResource>
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="XtraForm2.resx">
- <DependentUpon>XtraForm2.cs</DependentUpon>
</EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
--
Gitblit v1.9.3