模具剩余注浆次数、模具物料编码

DK.Client/PCModule/F_PC_1001.Designer.cs

@@ -30,7 +30,7 @@
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -44,6 +44,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dgvMould = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.grpCollapsible1 = new Dongke.WinForm.Controls.GrpCollapsible();
             this.txtRemarks = new Dongke.WinForm.Controls.TxtTextBox();
@@ -99,6 +100,7 @@
             this.ProductionDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GoodsCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mouldmaterialcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -108,6 +110,7 @@
             this.StandardGroutingSum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingNums = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.notusedGroutingNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingDateBegin = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.GroutingDateEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.LastGroutingBatchNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -165,6 +168,7 @@
             this.ProductionDate,
             this.GoodsID,
             this.GoodsCode,
+            this.mouldmaterialcode,
             this.UserID,
             this.UserCode,
             this.Weight,
@@ -174,6 +178,7 @@
             this.StandardGroutingSum,
             this.GroutingNum,
             this.GroutingNums,
+            this.notusedGroutingNum,
             this.GroutingDateBegin,
             this.GroutingDateEnd,
             this.LastGroutingBatchNo,
@@ -212,8 +217,8 @@
             this.dgvMould.RefreshAtHscroll = false;
             this.dgvMould.RowHeadersWidth = 50;
             this.dgvMould.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.dgvMould.RowsDefaultCellStyle = dataGridViewCellStyle16;
+            dataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+            this.dgvMould.RowsDefaultCellStyle = dataGridViewCellStyle17;
             this.dgvMould.RowTemplate.Height = 21;
             this.dgvMould.Size = new System.Drawing.Size(984, 213);
             this.dgvMould.SortOrderColumnName = null;
@@ -755,6 +760,13 @@
             this.GoodsCode.Name = "GoodsCode";
             this.GoodsCode.ReadOnly = true;
             // 
+            // mouldmaterialcode
+            // 
+            this.mouldmaterialcode.DataPropertyName = "mouldmaterialcode";
+            this.mouldmaterialcode.HeaderText = "物料编码";
+            this.mouldmaterialcode.Name = "mouldmaterialcode";
+            this.mouldmaterialcode.ReadOnly = true;
+            // 
             // UserID
             // 
             this.UserID.DataPropertyName = "UserID";
@@ -841,12 +853,22 @@
             this.GroutingNums.Name = "GroutingNums";
             this.GroutingNums.ReadOnly = true;
             // 
+            // notusedGroutingNum
+            // 
+            this.notusedGroutingNum.DataPropertyName = "notusedGroutingNum";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle11.Format = "N0";
+            this.notusedGroutingNum.DefaultCellStyle = dataGridViewCellStyle11;
+            this.notusedGroutingNum.HeaderText = "剩余次数";
+            this.notusedGroutingNum.Name = "notusedGroutingNum";
+            this.notusedGroutingNum.ReadOnly = true;
+            // 
             // GroutingDateBegin
             // 
             this.GroutingDateBegin.DataPropertyName = "GroutingDateBegin";
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.Format = "yyyy-MM-dd";
-            this.GroutingDateBegin.DefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.Format = "yyyy-MM-dd";
+            this.GroutingDateBegin.DefaultCellStyle = dataGridViewCellStyle12;
             this.GroutingDateBegin.HeaderText = "注浆日期(起始)";
             this.GroutingDateBegin.Name = "GroutingDateBegin";
             this.GroutingDateBegin.ReadOnly = true;
@@ -854,9 +876,9 @@
             // GroutingDateEnd
             // 
             this.GroutingDateEnd.DataPropertyName = "GroutingDateEnd";
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.Format = "yyyy-MM-dd";
-            this.GroutingDateEnd.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle13.Format = "yyyy-MM-dd";
+            this.GroutingDateEnd.DefaultCellStyle = dataGridViewCellStyle13;
             this.GroutingDateEnd.HeaderText = "注浆日期(当前)";
             this.GroutingDateEnd.Name = "GroutingDateEnd";
             this.GroutingDateEnd.ReadOnly = true;
@@ -864,9 +886,9 @@
             // LastGroutingBatchNo
             // 
             this.LastGroutingBatchNo.DataPropertyName = "LastGroutingBatchNo";
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle13.Format = "N0";
-            this.LastGroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle14.Format = "N0";
+            this.LastGroutingBatchNo.DefaultCellStyle = dataGridViewCellStyle14;
             this.LastGroutingBatchNo.HeaderText = "注浆批次(当前)";
             this.LastGroutingBatchNo.Name = "LastGroutingBatchNo";
             this.LastGroutingBatchNo.ReadOnly = true;
@@ -900,9 +922,9 @@
             // ScrapDate
             // 
             this.ScrapDate.DataPropertyName = "ScrapDate";
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle14.Format = "yyyy-MM-dd";
-            this.ScrapDate.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle15.Format = "yyyy-MM-dd";
+            this.ScrapDate.DefaultCellStyle = dataGridViewCellStyle15;
             this.ScrapDate.HeaderText = "报废日期";
             this.ScrapDate.Name = "ScrapDate";
             this.ScrapDate.ReadOnly = true;
@@ -952,9 +974,9 @@
             // CreateTime
             // 
             this.CreateTime.DataPropertyName = "CreateTime";
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle15.Format = "yyyy-MM-dd";
-            this.CreateTime.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle16.Format = "yyyy-MM-dd";
+            this.CreateTime.DefaultCellStyle = dataGridViewCellStyle16;
             this.CreateTime.HeaderText = "创建日期";
             this.CreateTime.Name = "CreateTime";
             this.CreateTime.ReadOnly = true;
@@ -1044,6 +1066,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ProductionDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsID;
         private System.Windows.Forms.DataGridViewTextBoxColumn GoodsCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mouldmaterialcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserID;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
         private System.Windows.Forms.DataGridViewTextBoxColumn Weight;
@@ -1053,6 +1076,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn StandardGroutingSum;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingNum;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingNums;
+        private System.Windows.Forms.DataGridViewTextBoxColumn notusedGroutingNum;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDateBegin;
         private System.Windows.Forms.DataGridViewTextBoxColumn GroutingDateEnd;
         private System.Windows.Forms.DataGridViewTextBoxColumn LastGroutingBatchNo;

DK.Client/PCModule/F_PC_1001.resx

@@ -144,6 +144,9 @@
   <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mouldmaterialcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="UserID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -171,6 +174,9 @@
   <metadata name="GroutingNums.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="notusedGroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GroutingDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Client/PCModule/F_PC_1101.resx

@@ -308,6 +308,9 @@
   <metadata name="GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mouldmaterialcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GroutingUserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -317,6 +320,9 @@
   <metadata name="GroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="notusedGroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GroutingDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -362,6 +368,9 @@
   <metadata name="g2GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g2mouldmaterialcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g2UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -371,6 +380,9 @@
   <metadata name="g2GroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g2notusedGroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g2GroutingDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -416,6 +428,9 @@
   <metadata name="g3GoodsCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g3mouldmaterialcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g3UserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -425,6 +440,9 @@
   <metadata name="g3GroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g3notusedGroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="g3GroutingDateBegin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -470,6 +488,9 @@
   <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g4mouldmaterialcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -479,6 +500,9 @@
   <metadata name="dataGridViewTextBoxColumn10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="g4notusedGroutingNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

DK.Service/PCModuleService/PCModuleLogic.cs

@@ -1939,9 +1939,13 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 "      ,m.CreateTime\n" +
                 "      ,cu.usercode CreateUserCode\n" +
 				"      ,m.OutputCount\n" +
-				"  FROM tp_pc_mould m\n" +
+                "      ,g.mouldmaterialcode\n" +
+                "      ,m.STANDARDGROUTINGSUM - m.GroutingNum notusedGroutingNum\n" +
+                "  FROM tp_pc_mould m\n" +
                 "  LEFT JOIN tp_mst_datadictionary mtype\n" +
                 "    ON mtype.dictionaryid = m.mouldtype\n" +
+                "  LEFT JOIN tp_mst_goods g\n" +
+                "    ON g.goodsid = m.goodsid\n" +
                 "  LEFT JOIN tp_mst_mouldmaterialsuppliers mms\n" +
                 "    ON mms.SupplierID = m.MaterialSupplier\n" +
                 " INNER JOIN tp_sys_mouldstatus ms\n" +
@@ -3455,12 +3459,19 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 "      ,gbcd.UserCode\n" +
                 "      ,gbcd.Weight\n" +
                 "      ,gbcd.Cost\n" +
-                "      ,gbcd.StandardGroutingNum\n" +
-                "      ,gbcd.GroutingNum\n" +
-                "      ,gbcd.GroutingDateBegin\n" +
-                "      ,gbcd.GroutingDateEnd\n" +
-                "      ,gbcd.LastGroutingBatchNo\n" +
-                "      ,gbcd.MouldStatus\n" +
+                //"      ,gbcd.StandardGroutingNum\n" +
+                "      ,m.STANDARDGROUTINGSUM StandardGroutingNum\n" +
+                "      ,m.STANDARDGROUTINGSUM - m.GroutingNum notusedGroutingNum\n" +
+                "      ,m.GroutingNum\n" +
+                "      ,m.GroutingDateBegin\n" +
+                "      ,m.GroutingDateEnd\n" +
+                "      ,m.LastGroutingBatchNo\n" +
+                "      ,m.MouldStatus\n" +
+                //"      ,gbcd.GroutingNum\n" +
+                //"      ,gbcd.GroutingDateBegin\n" +
+                //"      ,gbcd.GroutingDateEnd\n" +
+                //"      ,gbcd.LastGroutingBatchNo\n" +
+                //"      ,gbcd.MouldStatus\n" +
                 "      ,ms.mouldstatusname\n" +
                 "      ,gbcd.RepairFlag\n" +
                 "      ,gbcd.ScrapDate\n" +
@@ -3474,9 +3485,14 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 "      ,gbcd.CheckedFlag -- 盘点标识\n" +
                 "      ,gbcd.CheckedDate -- 盘点时间\n" +
                 "      ,CUser.usercode   CheckedUserCode -- 盘点工号\n" +
+                "      ,g.mouldmaterialcode\n" +
                 "  FROM tp_pc_mouldcheckeddetail gbcd\n" +
                 "  LEFT JOIN tp_mst_datadictionary mtype\n" +
                 "    ON mtype.dictionaryid = gbcd.mouldtype\n" +
+                "  LEFT JOIN tp_pc_mould m\n" +
+                "    ON m.MouldID = gbcd.MouldID\n" +
+                "  LEFT JOIN tp_mst_goods g\n" +
+                "    ON g.goodsid = m.goodsid\n" +
                 "  LEFT JOIN tp_mst_mouldmaterialsuppliers mms\n" +
                 "    ON mms.SupplierID = gbcd.MaterialSupplier\n" +
                 " INNER JOIN tp_sys_mouldstatus ms\n" +

IBOSS.PRD/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.131")]
-[assembly: AssemblyFileVersion("1.0.1.131")]
+[assembly: AssemblyVersion("1.0.1.132")]
+[assembly: AssemblyFileVersion("1.0.1.132")]

WCF.Service/WCF.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.131")]
-[assembly: AssemblyFileVersion("1.0.1.131")]
+[assembly: AssemblyVersion("1.0.1.132")]
+[assembly: AssemblyFileVersion("1.0.1.132")]