Merge branch 'master' of ssh://pscg.dongkesoft.com:9003/mes/hg5020

DK.Client/SystemModule/F_MST_0412.Designer.cs

@@ -37,6 +37,7 @@
             this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.PrinterName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PrintType = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.displayno = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DGV_Column_Digital();
             this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -71,9 +72,11 @@
             dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
             dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
             this.dgvPrinter.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvPrinter.ColumnHeadersHeight = 29;
             this.dgvPrinter.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvPrinter.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.PrinterName,
+            this.PrintType,
             this.displayno,
             this.Remarks,
             this.ValueFlag,
@@ -83,6 +86,7 @@
             this.dgvPrinter.DynamicColumnName = "";
             this.dgvPrinter.EnableHeadersVisualStyles = false;
             this.dgvPrinter.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvPrinter.FormatQuantityColumns = null;
             this.dgvPrinter.HorizontalMergeColumn = null;
             this.dgvPrinter.IsAutoCountSum = false;
             this.dgvPrinter.IsAutoResizeColumns = false;
@@ -91,7 +95,8 @@
             this.dgvPrinter.IsProcessRightFlag = false;
             this.dgvPrinter.IsSubTotalFlag = false;
             this.dgvPrinter.IsTopDeep = false;
-            this.dgvPrinter.Location = new System.Drawing.Point(12, 12);
+            this.dgvPrinter.Location = new System.Drawing.Point(16, 15);
+            this.dgvPrinter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvPrinter.MergeColumnNames = null;
             this.dgvPrinter.MergeDetailColumnNames = null;
             this.dgvPrinter.MergeDetailOnlyColumn = null;
@@ -104,7 +109,7 @@
             dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.dgvPrinter.RowsDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvPrinter.RowTemplate.Height = 21;
-            this.dgvPrinter.Size = new System.Drawing.Size(484, 498);
+            this.dgvPrinter.Size = new System.Drawing.Size(645, 622);
             this.dgvPrinter.SortOrderColumnName = null;
             this.dgvPrinter.TabIndex = 0;
             this.dgvPrinter.Tag = true;
@@ -125,9 +130,10 @@
             this.chkDisplayDisabledData.AutoSize = true;
             this.chkDisplayDisabledData.BackgroundImage = global::Dongke.IBOSS.PRD.Client.SystemModule.Resource1.functionbackground;
             this.chkDisplayDisabledData.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkDisplayDisabledData.Location = new System.Drawing.Point(12, 516);
+            this.chkDisplayDisabledData.Location = new System.Drawing.Point(25, 646);
+            this.chkDisplayDisabledData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkDisplayDisabledData.Name = "chkDisplayDisabledData";
-            this.chkDisplayDisabledData.Size = new System.Drawing.Size(96, 16);
+            this.chkDisplayDisabledData.Size = new System.Drawing.Size(119, 19);
             this.chkDisplayDisabledData.TabIndex = 1;
             this.chkDisplayDisabledData.Text = "显示停用记录";
             this.chkDisplayDisabledData.UseVisualStyleBackColor = true;
@@ -140,9 +146,10 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(320, 516);
+            this.btnSave.Location = new System.Drawing.Point(427, 645);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(85, 30);
+            this.btnSave.Size = new System.Drawing.Size(113, 38);
             this.btnSave.TabIndex = 2;
             this.btnSave.Text = "保存";
             this.btnSave.UseVisualStyleBackColor = true;
@@ -156,9 +163,10 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(411, 516);
+            this.btnCancel.Location = new System.Drawing.Point(548, 645);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.Size = new System.Drawing.Size(113, 38);
             this.btnCancel.TabIndex = 3;
             this.btnCancel.Text = "关闭";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -169,9 +177,20 @@
             this.PrinterName.DataPropertyName = "PrinterName";
             this.PrinterName.HeaderText = "打印机名";
             this.PrinterName.MaxInputLength = 100;
+            this.PrinterName.MinimumWidth = 6;
             this.PrinterName.Name = "PrinterName";
             this.PrinterName.Width = 120;
             // 
+            // PrintType
+            // 
+            this.PrintType.DataPropertyName = "PrintType";
+            this.PrintType.HeaderText = "打印类型";
+            this.PrintType.MinimumWidth = 6;
+            this.PrintType.Name = "PrintType";
+            this.PrintType.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.PrintType.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.PrintType.Width = 125;
+            // 
             // displayno
             // 
             this.displayno.DataPropertyName = "displayno";
@@ -183,6 +202,7 @@
             0,
             0,
             0});
+            this.displayno.MinimumWidth = 6;
             this.displayno.MinValue = new decimal(new int[] {
             0,
             0,
@@ -191,12 +211,14 @@
             this.displayno.Name = "displayno";
             this.displayno.Number = new System.Drawing.Point(2, 0);
             this.displayno.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.displayno.Width = 125;
             // 
             // Remarks
             // 
             this.Remarks.DataPropertyName = "Remarks";
             this.Remarks.HeaderText = "备注";
             this.Remarks.MaxInputLength = 500;
+            this.Remarks.MinimumWidth = 6;
             this.Remarks.Name = "Remarks";
             this.Remarks.Width = 150;
             // 
@@ -205,6 +227,7 @@
             this.ValueFlag.DataPropertyName = "ValueFlag";
             this.ValueFlag.FalseValue = "0";
             this.ValueFlag.HeaderText = "正常";
+            this.ValueFlag.MinimumWidth = 6;
             this.ValueFlag.Name = "ValueFlag";
             this.ValueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.ValueFlag.TrueValue = "1";
@@ -214,17 +237,19 @@
             // 
             this.PrinterID.DataPropertyName = "PrinterID";
             this.PrinterID.HeaderText = "PrinterID";
+            this.PrinterID.MinimumWidth = 6;
             this.PrinterID.Name = "PrinterID";
             this.PrinterID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.PrinterID.Visible = false;
+            this.PrinterID.Width = 125;
             // 
             // F_MST_0412
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Window;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(508, 571);
+            this.ClientSize = new System.Drawing.Size(677, 714);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.btnSave);
             this.Controls.Add(this.chkDisplayDisabledData);
@@ -232,6 +257,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "F_MST_0412";
@@ -259,6 +285,7 @@
         private Basics.BaseControls.C_Button btnSave;
         private Basics.BaseControls.C_Button btnCancel;
         private System.Windows.Forms.DataGridViewTextBoxColumn PrinterName;
+        private System.Windows.Forms.DataGridViewComboBoxColumn PrintType;
         private Basics.BaseControls.C_DGV_Column_Digital displayno;
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;

DK.Client/SystemModule/F_MST_0412.cs

@@ -29,6 +29,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
         private static F_MST_0412 _instance;
         // 条码打印机数据源
         private DataTable _dtSourse;
+        // 打印类型数据源 xuwei add 2019-11-21
+        private DataTable _dtPrintType;
 
         #endregion
 
@@ -45,6 +47,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
             // 按钮
             this.btnSave.Text = ButtonText.BTN_SAVE;
             this.btnCancel.Text = ButtonText.BTN_CLOSE;
+
         }
 
         #endregion
@@ -79,6 +82,15 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
         {
             try
             {
+                //xuwe add 2019-11-21 加载 打印类型
+                ClientRequestEntity ptCre = new ClientRequestEntity();
+                ptCre.NameSpace = "PrintInfo";
+                ptCre.Name = "GetPrintType";
+                _dtPrintType = SystemModuleProxy.Service.DoBarCodePrint(ptCre).Data.Tables[0];
+                PrintType.DisplayMember = "PRINTTYPENAME";
+                PrintType.ValueMember = "PRINTTYPEID";
+                PrintType.DataSource = _dtPrintType;
+
                 // 设置datagridview不自动创建列
                 this.dgvPrinter.AutoGenerateColumns = false;
                 // 加载打印机数据

DK.Client/SystemModule/F_MST_0412.resx

@@ -117,26 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="PrintType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="displayno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAAC8SURBVGhD7dihEcQgEEZhGkSicbSARVEQFdALjiY2g7jL
-        nd5dkckTNPDN/xiSUEoRjt6g9y5zTtl7SwBUD3oMQXWoE1RQbfL0vuZYKktlqa99npE/+ZM/+fNFZVcB
-        dyp3qt2aPD8A/paacxaO3qC1dv+lAlQPegxBdagTVAfUWuudf0pJOHqDD+paSwKgetBjCKpDnaCCapOn
-        9zXHUlkqS33t84z8yf85+Y8xhMe/4WJP/l/UGKNw9Aa/qBc8hkQFRRsgcgAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Service/PDAModuleLogic/PDAModuleLogicWorkShop3.cs

@@ -635,6 +635,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
             string sqlStr = "";
             int result = -1;
             int classesSettingId = -1;
+            string groutingBatchNo = "";
             try
             {
                 conn.Connect();
@@ -644,6 +645,13 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                 //jsonL["GROUTINGLINECODE"].ToString();成型线号
                 //jsonL["GROUTINGTIMES"].ToString();注浆次数
 
+                //注浆批次处理 当注浆日期 等于 当前日期 时 注浆批次 为最后注浆批次 加1 处理
+                //当注浆日期 不等于 当前日期 时 注浆批数 从0开始 加1 处理
+                if (DateTime.Now.ToString("yyyy-MM-dd") == jsonL["GROUTINGDATE"].ToString())
+                    groutingBatchNo = "l.LASTGROUTINGBATCHNO";
+                else
+                    groutingBatchNo = "0";
+
                 //校验工号 成型线工号配置的工号 必须包含当前用户
                 if (sre.Status == Constant.ServiceResultStatus.Success)
                 {
@@ -816,7 +824,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                 '{sUser.UserCode}',-- USERCODE
                                 l.GMOULDSTATUS,
                                 {classesSettingId}, -- 从 CLASSESSETTINGID 查询
-                                l.LASTGROUTINGBATCHNO + {i} + 1, --LASTGROUTINGBATCHNO 批次号 每注一次加1
+                                {groutingBatchNo} + {i} + 1, --LASTGROUTINGBATCHNO 批次号 每注一次加1
                                 l.MONITORID,
                                 m.USERCODE AS MONITORCODE, --MONITORCODE 关联 TP_MST_USER 查询
                                 l.HIGHPRESSUREFLAG
@@ -828,8 +836,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 	                            GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}' --成型线号
                              AND l.VALUEFLAG = '1'
                              AND l.GMOULDSTATUS = 1
-                            ;
-                        ";
+                            ;";
 
                             //按成型线模具循环插入注浆记录明细 TP_PM_GROUTINGDAILYDETAIL
                             JArray jsonM = JArray.Parse(jsonL["GROUTINGLINEDETAIL"].ToString());
@@ -865,7 +872,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     g.GOODSCODE,--GOODSCODE
                                     g.GOODSNAME,--GOODSNAME
                                     d.GMOULDSTATUS,--GMOULDSTATUS
-                                    d.GROUTINGCOUNT,--GROUTINGCOUNT
+                                    d.GROUTINGCOUNT + {jsonM[j]["GROUTINGFLAG"].ToString()},--GROUTINGCOUNT
                                     '{jsonM[j]["GROUTINGFLAG"].ToString()}',--GROUTINGFLAG
                                     {jsonM[j]["NOGROUTINGRREASON"].ToString()}, --NOGROUTINGRREASON  未注浆原因
                                     {sUser.AccountID},--ACCOUNTID
@@ -882,7 +889,7 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                                     '0',--DELIVERFLAG
                                     l.GMOULDTYPEID,--GMOULDTYPEID
                                     t.CANMANYTIMES,--CANMANYTIMES
-                                    l.LASTGROUTINGBATCHNO + {i} + 1, --LASTGROUTINGBATCHNO 批次号 每注一次加1
+                                    {groutingBatchNo} + {i} + 1, --LASTGROUTINGBATCHNO 批次号 每注一次加1
                                     o.LOGOID,--LOGOID
                                     NULL,--SCRAPTIME
                                     NULL,--SCRAPUSER
@@ -904,8 +911,22 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
 	                                AND d.GMOULDSTATUS = 1 
 	                                AND l.GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}' --成型线号
                                     AND d.GROUTINGMOULDCODE = '{jsonM[j]["GROUTINGMOULDCODE"].ToString()}'
-                                ;
-                            ";
+                                ;";
+
+                                //更新注浆次数
+                                sqlStr += $@"
+                                UPDATE 
+                                    TP_PC_GROUTINGLINEDETAIL
+                                SET 
+                                    GROUTINGCOUNT = GROUTINGCOUNT + {jsonM[j]["GROUTINGFLAG"].ToString()}
+                                WHERE
+                                    d.ACCOUNTID = {sUser.AccountID}
+	                                AND d.VALUEFLAG = '1' 
+	                                AND d.GMOULDSTATUS = 1 
+	                                AND l.GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}' --成型线号
+                                    AND d.GROUTINGMOULDCODE = '{jsonM[j]["GROUTINGMOULDCODE"].ToString()}'
+                                ;";
+
                             }
                         }
                         sqlStr += "END;";
@@ -925,17 +946,17 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                         sre.Message = "注浆记录写入失败！";
                     }
                 }
-                //更新 成型线 最后注浆日期 已注浆次数
+                //更新 成型线 最后注浆日期 注浆批次
                 if(sre.Status==Constant.ServiceResultStatus.Success)
                 {
                     sqlStr = $@"
                         UPDATE 
-                            TP_PC_GROUTINGLINE
+                            TP_PC_GROUTINGLINE l
                         SET 
-                            LASTGROUTINGDATE = DATE '{jsonL["GROUTINGDATE"].ToString()}',
-                            LASTGROUTINGBATCHNO = LASTGROUTINGBATCHNO + {jsonL["GROUTINGTIMES"].ToString()}
+                            l.LASTGROUTINGDATE = DATE '{jsonL["GROUTINGDATE"].ToString()}',
+                            l.LASTGROUTINGBATCHNO = {groutingBatchNo} + {jsonL["GROUTINGTIMES"].ToString()}
                         WHERE
-                            GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}'
+                            l.GROUTINGLINECODE = '{jsonL["GROUTINGLINECODE"].ToString()}'
                         ";
                     result = conn.ExecuteNonQuery(sqlStr);
                     if (result > 0)
@@ -946,10 +967,10 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                     else
                     {
                         sre.Status = Constant.ServiceResultStatus.NoSearchResults;
-                        sre.Message = "成型线最后注浆日期和已注浆次数更新失败！";
+                        sre.Message = "成型线最后注浆日期和注浆批次更新失败！";
                     }
                 }
-                //提交 测试数据 暂不提交
+                //提交
                 if (sre.Status == Constant.ServiceResultStatus.Success)
                     conn.Commit();
                 else
@@ -1006,7 +1027,8 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                     {
                         JArray json = JArray.Parse(groutingData);
                         string updateOne = $@"
-                            UPDATE TP_PM_GROUTINGDAILYDETAIL
+                            UPDATE 
+                                TP_PM_GROUTINGDAILYDETAIL
                             SET
                                 GROUTINGFLAG = ':GROUTINGFLAG',
                                 NOGROUTINGRREASON = :NOGROUTINGRREASON
@@ -1038,6 +1060,57 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                         sre.Message = "注浆记录保存失败！";
                     }
                 }
+                //更新成型线明细注浆次数
+                if (sre.Status == Constant.ServiceResultStatus.Success && groutingData != "")
+                {
+                    try
+                    {
+                        JArray json = JArray.Parse(groutingData);
+                        string updateOne = $@"
+                            UPDATE 
+                                TP_PC_GROUTINGLINEDETAIL
+                            SET 
+                                GROUTINGCOUNT = GROUTINGCOUNT + :GROUTINGCOUNT
+                            WHERE 
+                                GROUTINGLINEDETAILID = :GROUTINGLINEDETAILID
+                            ;
+                            ";
+                        sqlStr = "BEGIN";
+                        DataTable dt = new DataTable();
+                        for (int i=0;i<json.Count;i++)
+                        {
+                            //读取原注浆记录进行比对，原来 注浆标识 为1 现在 注浆标识 为0 要-1 
+                            dt = conn.GetSqlResultToDt($@"
+                                SELECT  
+                                    GROUTINGLINEDETAILID,
+                                    GROUTINGFLAG
+                                FROM
+                                    TP_PM_GROUTINGDAILYDETAIL
+                                WHERE
+                                    GROUTINGDAILYDETAILID = {json[i]["GROUTINGDAILYDETAILID"].ToString()}
+                            ");
+                            string groutingCount = "";
+
+                            //注浆标识改变 才更新 注浆次数
+                            if(json[i]["GROUTINGFLAG"].ToString() != dt.Rows[0]["GROUTINGFLAG"].ToString())
+                            {
+                                groutingCount = json[i]["GROUTINGFLAG"].ToString() == "1" ? "1" : "-1";
+                                sqlStr += updateOne
+                                    .Replace(":GROUTINGCOUNT", groutingCount)
+                                    .Replace(":GROUTINGLINEDETAILID", dt.Rows[0]["GROUTINGLINEDETAILID"].ToString());
+                            }
+                        }
+                        sqlStr += "END;";
+                        result = conn.ExecuteNonQuery(sqlStr);
+                        sre.Status = Constant.ServiceResultStatus.Success;
+                        sre.Message = "操作成功！";
+                    }
+                    catch
+                    {
+                        sre.Status = Constant.ServiceResultStatus.NoSearchResults;
+                        sre.Message = "注浆次数更新失败！";
+                    }
+                }
                 //提交
                 if (sre.Status == Constant.ServiceResultStatus.Success)
                     conn.Commit();

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -4901,6 +4901,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PrinterID,PrinterName,Remarks,displayno "
+                                 + " ,PrintType " //xuwei add 2019-11-21
 								 + " from TP_MST_BarCodePrinter where AccountID = :AccountID and valueflag = '1' order by displayno";
 				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
@@ -4935,6 +4936,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 			{
 				ServiceResultEntity sre = new ServiceResultEntity();
 				string sqlString = "Select PrinterID,PrinterName,Remarks,AccountID,ValueFlag,CreateTime,CreateUserID,UpdateTime,UpdateUserID,OPTimeStamp "
+                                    + " ,PrintType"
 									+ " ,displayno from TP_MST_BarCodePrinter where AccountID = :AccountID order by displayno";
 				Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[]
 				   {
@@ -5031,6 +5033,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						string sqlInsertString = "INSERT INTO TP_MST_BarCodePrinter"
 												+ "(PrinterName"
 												+ ",DisplayNo"
+												+ ",PrintType" //xuwei add 2019-11-21
 												+ ",Remarks"
 												+ ",AccountID"
 												+ ",ValueFlag"
@@ -5039,6 +5042,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 										+ " VALUES "
 												+ "(:PrinterName"
 												+ ",:DisplayNo"
+												+ ",:PrintType" //xuwei add 2019-11-21
 												+ ",:Remarks"
 												+ ",:AccountID"
 												+ ",:ValueFlag"
@@ -5048,6 +5052,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						{
 							new OracleParameter(":PrinterName",dataRow["PrinterName"].ToString()),
 							new OracleParameter(":DisplayNo",dataRow["DisplayNo"]),
+							new OracleParameter(":PrintType",dataRow["PrintType"]),
 							new OracleParameter(":Remarks",dataRow["Remarks"].ToString()),
 							new OracleParameter(":AccountID",sUserInfo.AccountID),
 							new OracleParameter(":ValueFlag",dataRow["ValueFlag"].ToString()),
@@ -5062,6 +5067,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						string sqlUpdateString = "UPDATE TP_MST_BarCodePrinter SET "
 											+ " PrinterName = :PrinterName,"
 											+ " DisplayNo = :DisplayNo,"
+											+ " PrintType = :PrintType," //xuwei add 2019-11-21
 											+ " Remarks = :Remarks,"
 											+ " AccountID = :AccountID,"
 											+ " ValueFlag = :ValueFlag,"
@@ -5071,6 +5077,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						{
 							new OracleParameter(":PrinterName",dataRow["PrinterName"]),
 							new OracleParameter(":DisplayNo",dataRow["DisplayNo"]),
+							new OracleParameter(":PrintType",dataRow["PrintType"]), //xuwei add 2019-11-21
 							new OracleParameter(":Remarks",dataRow["Remarks"]),
 							new OracleParameter(":AccountID",sUserInfo.AccountID),
 							new OracleParameter(":ValueFlag",dataRow["ValueFlag"]),