From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段，放在接收数量后面，不允许编辑，每次扫进站单出站单的时候，自动把白坯发布的汇总数量显示。生产订单模块增加一个字段，是否取库存,底部备注，做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂（第一道和第二道）（把以前所有的流水号加20，在把白坯定型（10），和染厂（20）刷进去
---
Kanban/Kanban.csproj | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index 224ac8b..0a2655c 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -59,6 +59,13 @@
<OutputPath>bin\x86\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -91,11 +98,29 @@
<Compile Include="LED\Sc_LEDInfoNote.designer.cs">
<DependentUpon>Sc_LEDInfoNote.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="Sc_CJKB.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Sc_CJKB.designer.cs">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ </Compile>
<Compile Include="Sc_ProductionLineKB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Sc_ProductionLineKB.designer.cs">
<DependentUpon>Sc_ProductionLineKB.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_WorkshopKB.cs">
<SubType>Form</SubType>
@@ -317,8 +342,20 @@
<DependentUpon>Sc_LEDInfoNote.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Sc_CGKB.resx">
+ <DependentUpon>Sc_CGKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_CJKB.resx">
+ <DependentUpon>Sc_CJKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="Sc_ProductionLineKB.resx">
<DependentUpon>Sc_ProductionLineKB.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Sc_QLKB.resx">
+ <DependentUpon>Sc_QLKB.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Sc_WorkshopKB.resx">
@@ -435,22 +472,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1