From e76d66b22d756bb54eb874f6f59e8ecfe0c91fe1 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 01 八月 2025 08:17:32 +0800
Subject: [PATCH] 入库申请单完成

---
 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs  |    1 +
 DevApp/Gs.DevApp/Gs.DevApp.csproj         |    9 +++++++++
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs |   12 ++++++------
 DevApp/Gs.DevApp/Program.cs               |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 92a4c65..465a4d7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -234,12 +234,12 @@
                 txt_itemId.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(_suppNo))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
-                txt_suppId.Focus();
-                return;
-            }
+            //if (string.IsNullOrEmpty(_suppNo))
+            //{
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+            //    txt_suppId.Focus();
+            //    return;
+            //}
             var _obj = new MesQaMj
             {
                 Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 696043f..1aeebe0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -411,6 +411,7 @@
             dataTable.Rows.Add("FQCYC(FQC寮傚父)");
             dataTable.Rows.Add("ZSM(杩芥函鐮�)");
             dataTable.Rows.Add("TB(鎵樻澘鐮�)");
+            dataTable.Rows.Add("RKSQ(鍏ュ簱鐢宠)");
             txt_docCode.Properties.DataSource = dataTable;
             txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
             txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 550312a..d36af3e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -598,6 +598,12 @@
     <Compile Include="DevFrm\Rk\Frm_MesItemTblShow.Designer.cs">
       <DependentUpon>Frm_MesItemTblShow.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\Rk\HistoryDhmxcs.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1521,6 +1527,9 @@
     <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTblShow.resx">
       <DependentUpon>Frm_MesItemTblShow.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\WOM\Frm_MesScrksqDj.resx">
+      <DependentUpon>Frm_MesScrksqDj.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx">
       <DependentUpon>HistoryDhmxcs.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 5e4cdf5..e320344 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -55,7 +55,7 @@
                 if (fmLogin.DialogResult == DialogResult.OK)
                 {
                     //Application.Run(new DevFrm.User.SysMenu());
-                    //return;
+                    //return;           
                     bool IsWeight = false;
                     try
                     {

--
Gitblit v1.9.3