撤销最后一次注浆

DK.Client/PMModule/F_PM_0101.Designer.cs

@@ -41,6 +41,7 @@
             this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
             this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
+            this.tsbtnUnLast = new System.Windows.Forms.ToolStripButton();
             this.tsbtnBindBarCode = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
@@ -119,6 +120,7 @@
             this.tsbtnAdd,
             this.tsbtnEdit,
             this.tsbtnBindBarCode,
+            this.tsbtnUnLast,
             this.toolStripSeparator3,
             this.tsbtnAdaptive,
             this.tsbtnClose});
@@ -151,6 +153,18 @@
             this.tsbtnEdit.Text = "编辑(&E)";
             this.tsbtnEdit.Click += new System.EventHandler(this.tsbtnEdit_Click);
             // 
+            // tsbtnUnLast
+            // 
+            this.tsbtnUnLast.AutoSize = false;
+            this.tsbtnUnLast.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbtnUnLast.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tsbtnUnLast.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tsbtnUnLast.Name = "tsbtnUnLast";
+            this.tsbtnUnLast.Size = new System.Drawing.Size(100, 25);
+            this.tsbtnUnLast.Text = "撤销最后注浆(&U)";
+            this.tsbtnUnLast.Visible = false;
+            this.tsbtnUnLast.Click += new System.EventHandler(this.tsbtnUnLast_Click);
+            // 
             // tsbtnBindBarCode
             // 
             this.tsbtnBindBarCode.AutoSize = false;
@@ -735,11 +749,19 @@
             this.dgvGroutingDaily.DynamicColumnName = "";
             this.dgvGroutingDaily.EnableHeadersVisualStyles = false;
             this.dgvGroutingDaily.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvGroutingDaily.FormatQuantityColumns = null;
+            this.dgvGroutingDaily.HorizontalMergeColumn = null;
             this.dgvGroutingDaily.IsAutoCountSum = true;
             this.dgvGroutingDaily.IsAutoResizeColumns = false;
             this.dgvGroutingDaily.IsClickF12 = false;
+            this.dgvGroutingDaily.IsOpenMergeCellFlag = false;
             this.dgvGroutingDaily.IsSubTotalFlag = false;
+            this.dgvGroutingDaily.IsTopDeep = false;
             this.dgvGroutingDaily.Location = new System.Drawing.Point(0, 168);
+            this.dgvGroutingDaily.MergeColumnNames = null;
+            this.dgvGroutingDaily.MergeDetailColumnNames = null;
+            this.dgvGroutingDaily.MergeDetailOnlyColumn = null;
+            this.dgvGroutingDaily.MergeOnlyColumn = null;
             this.dgvGroutingDaily.MultiSelect = false;
             this.dgvGroutingDaily.Name = "dgvGroutingDaily";
             this.dgvGroutingDaily.ReadOnly = true;
@@ -1050,5 +1072,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
         private Basics.BaseControls.C_StatusCheckBox chkDeliverFlag;
         private Basics.BaseControls.C_CheckBox chkDeliverTime;
+        private System.Windows.Forms.ToolStripButton tsbtnUnLast;
     }
 }

DK.Client/PMModule/F_PM_0101.cs

@@ -415,5 +415,20 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 this.dtpDeliverTimeEnd.Value = DateTime.Now.Date;
             }
         }
+
+        private void tsbtnUnLast_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                F_PM_0106 f_PM_0106 = new F_PM_0106();
+                f_PM_0106.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
     }
 }

DK.Client/PMModule/F_PM_0101.resx

@@ -168,28 +168,22 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnSearch.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="chkDeliverFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -239,19 +233,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="chkBarcodeFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -301,19 +290,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="chkScrapFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -363,28 +347,22 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnClearCondition.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="chkGroutingFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -434,19 +412,14 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAqNJREFUeF7t2IEJACAM
-        A8Huv6pCHcE9nnODvIE+meMhECIw10MgRGDWQyBEYJ6HQIjAhPRJFASOQitBigDlCJ1bUd5TaC1IEaAc
-        qYMrjB06tMGKcq8dOrTBirLLoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo422KgB3aeJsi
-        wKFpZ4oAh04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK
-        4UqnCCh06juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dO
-        rbDC2KFTK6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiU
-        QQqj0DqQIkA5UgdXGIXWgRQBypE6uMLYoVMrrDB26NQKKwyHThmkMByadqYIKHTqO4WhHK50ioBCp75T
-        GMrhSqcI2KFNtykCdmjTbYoAh6adKQIcOmWQwii0DqQIUI7UwRVGoXUgRYBypA6uMHbo1AorjB06tcIK
-        w6FTBikMh6adKQIKnfpOYSiHK50ioNCp7xSGcrjSKQJ2aNNtioAd2nSbIsChaWeKAIdOGaQwCq0DKQKU
-        I3VwhVFoHUgRoBypgyuMHTq1wgpjh06tsMJw6JRBCsOhaWeKgEKnvlMYyuFKpwgodOo7haEcrnSKgB3a
-        dJsiYIc23aYIcGjamSLAoVMGKYxC60CKAOVIHVxhFFoHUgQoR+rgCmOHTq2wwtihUyusMBw6ZZDCcGja
-        mSKg0KnvFIZyuNIpAgqd+k5hKIcrnSJghzbdpgjYoU23KQIcmnamCHDolEEKo9A6kCJAOVIHVxiF1oEU
-        gQ8JOi6YRcizXgAAAABJRU5ErkJggg==
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="GroutingDailyDetailID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

DK.Client/PMModule/F_PM_0106.Designer.cs

@@ -0,0 +1,167 @@
+
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    partial class F_PM_0106
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_PM_0106));
+            this.lblGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtGroutingLineCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+            this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnOK = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+            this.txtTextBox1 = new Dongke.WinForm.Controls.TxtTextBox();
+            this.SuspendLayout();
+            // 
+            // lblGroutingLineCode
+            // 
+            this.lblGroutingLineCode.AutoSize = true;
+            this.lblGroutingLineCode.BackColor = System.Drawing.Color.Transparent;
+            this.lblGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblGroutingLineCode.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.lblGroutingLineCode.Image = ((System.Drawing.Image)(resources.GetObject("lblGroutingLineCode.Image")));
+            this.lblGroutingLineCode.Location = new System.Drawing.Point(12, 18);
+            this.lblGroutingLineCode.Name = "lblGroutingLineCode";
+            this.lblGroutingLineCode.Size = new System.Drawing.Size(65, 12);
+            this.lblGroutingLineCode.TabIndex = 0;
+            this.lblGroutingLineCode.Text = "成型线编码";
+            // 
+            // txtGroutingLineCode
+            // 
+            this.txtGroutingLineCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtGroutingLineCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+            this.txtGroutingLineCode.ErrorMessage = "";
+            this.txtGroutingLineCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGroutingLineCode.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtGroutingLineCode.Location = new System.Drawing.Point(83, 15);
+            this.txtGroutingLineCode.MaxLength = 30;
+            this.txtGroutingLineCode.Name = "txtGroutingLineCode";
+            this.txtGroutingLineCode.Size = new System.Drawing.Size(124, 21);
+            this.txtGroutingLineCode.TabIndex = 1;
+            this.txtGroutingLineCode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtGroutingLineCode_KeyPress);
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.BackColor = System.Drawing.Color.Transparent;
+            this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+            this.btnSearch.Font = new System.Drawing.Font("宋体", 9F);
+            this.btnSearch.ForeColor = System.Drawing.Color.White;
+            this.btnSearch.Location = new System.Drawing.Point(213, 12);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(85, 30);
+            this.btnSearch.TabIndex = 9;
+            this.btnSearch.Text = "查询(&Q)";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // btnOK
+            // 
+            this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnOK.BackColor = System.Drawing.Color.Transparent;
+            this.btnOK.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnOK.BackgroundImage")));
+            this.btnOK.Enabled = false;
+            this.btnOK.Font = new System.Drawing.Font("宋体", 9F);
+            this.btnOK.ForeColor = System.Drawing.Color.White;
+            this.btnOK.Location = new System.Drawing.Point(123, 287);
+            this.btnOK.Name = "btnOK";
+            this.btnOK.Size = new System.Drawing.Size(85, 30);
+            this.btnOK.TabIndex = 3;
+            this.btnOK.Text = "确定";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.BackColor = System.Drawing.Color.Transparent;
+            this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Font = new System.Drawing.Font("宋体", 9F);
+            this.btnCancel.ForeColor = System.Drawing.Color.White;
+            this.btnCancel.Location = new System.Drawing.Point(214, 287);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(85, 30);
+            this.btnCancel.TabIndex = 4;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // txtTextBox1
+            // 
+            this.txtTextBox1.Location = new System.Drawing.Point(14, 48);
+            this.txtTextBox1.Multiline = true;
+            this.txtTextBox1.Name = "txtTextBox1";
+            this.txtTextBox1.ReadOnly = true;
+            this.txtTextBox1.Size = new System.Drawing.Size(275, 233);
+            this.txtTextBox1.TabIndex = 10;
+            // 
+            // F_PM_0106
+            // 
+            this.AcceptButton = this.btnOK;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(311, 342);
+            this.Controls.Add(this.txtTextBox1);
+            this.Controls.Add(this.btnSearch);
+            this.Controls.Add(this.lblGroutingLineCode);
+            this.Controls.Add(this.txtGroutingLineCode);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOK);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.IsSaveFormLocation = false;
+            this.IsSaveFormSize = false;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "F_PM_0106";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.StatusSizingGrip = false;
+            this.Text = "取消最后一次注浆登记";
+            this.Load += new System.EventHandler(this.F_PM_0106_Load);
+            this.Controls.SetChildIndex(this.btnOK, 0);
+            this.Controls.SetChildIndex(this.btnCancel, 0);
+            this.Controls.SetChildIndex(this.txtGroutingLineCode, 0);
+            this.Controls.SetChildIndex(this.lblGroutingLineCode, 0);
+            this.Controls.SetChildIndex(this.btnSearch, 0);
+            this.Controls.SetChildIndex(this.txtTextBox1, 0);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private Basics.BaseControls.C_Label lblGroutingLineCode;
+        private Basics.BaseControls.C_TextBox txtGroutingLineCode;
+        private Basics.BaseControls.C_Button btnSearch;
+        private Basics.BaseControls.C_Button btnOK;
+        private Basics.BaseControls.C_Button btnCancel;
+        private WinForm.Controls.TxtTextBox txtTextBox1;
+    }
+}

DK.Client/PMModule/F_PM_0106.cs

@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * Copyright(c) 2015 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *      1.程序名称：F_PM_0106.cs
+ *      2.功能描述：取消最后一次注浆登记
+ * 编辑履历：
+ *      作者            日期                版本            修改内容
+ *      陈晓野          2020/02/18          1.00            新建
+ *******************************************************************************/
+using System;
+using System.Data;
+using System.Reflection;
+using System.Windows.Forms;
+
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.Client.Controls;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.PMModule
+{
+    /// <summary>
+    /// 取消最后一次注浆登记
+    /// </summary>
+    public partial class F_PM_0106 : DKFormBase
+    {
+        #region 成员变量
+        private DataSet _data = null;
+        #endregion
+
+        #region 构造函数
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public F_PM_0106()
+        {
+            this.InitializeComponent();
+            // 为各个控件文本赋值
+            this.InitializeControls();
+        }
+        #endregion
+
+        #region 属性
+
+        /// <summary>
+        /// 注浆日报ID
+        /// </summary>
+        public string GroutingLineCode
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// 是否在开模报损中使用
+        /// </summary>
+        public bool IsBarCodeScrapReasonUseFlag
+        {
+            get;
+            set;
+        }
+        #endregion
+
+        #region 控件事件
+        /// <summary>
+        /// 页面Load事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void F_PM_0106_Load(object sender, EventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// 查询按钮按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnSearch_Click(object sender, System.EventArgs e)
+        {
+            string glcode = this.txtGroutingLineCode.Text.Trim();
+            if (string.IsNullOrWhiteSpace(glcode))
+            {
+                MessageBox.Show("请输入成型线编码",this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                this.txtGroutingLineCode.Focus();
+                return;
+            }
+            try
+            {
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "F_PM_0106";
+                cre.Name = "CheckFPM0106GLCode";
+                cre.Properties["glcode"] = glcode;
+                // 根据注浆日期、成型线获取所有可注浆模具信息
+                ServiceResultEntity sre = this.DoAsync<ServiceResultEntity>(() =>
+                    {
+                        return PMModuleProxyNew.Service.HandleRequest(cre);
+                    }
+                );
+
+                // 异常情况处理
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    _data = sre.Data;
+                    DataRow dataRow = _data.Tables[0].Rows[0];
+                    this.txtTextBox1.Text = 
+                        $"成型线编码  ：{dataRow["GroutingLineCode"]} " + Environment.NewLine + Environment.NewLine +
+                        $"最后注浆日期：{dataRow["LastGroutingDate"]} " + Environment.NewLine + Environment.NewLine +
+                        $"最后注浆批次：{dataRow["LastGroutingBatchNo"]} " + Environment.NewLine + Environment.NewLine +
+                        $"成型工号    ：{dataRow["usercode"]} "
+                        ;
+
+                    this.btnOK.Enabled = true;
+                    return;
+                }
+
+                _data = null;
+                this.btnOK.Enabled = false;
+                MessageBox.Show(sre.Message, this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 确定按钮按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnOK_Click(object sender, System.EventArgs e)
+        {
+            if (_data == null)
+            {
+                return;
+            }
+            try
+            {
+                ClientRequestEntity cre = new ClientRequestEntity();
+                cre.NameSpace = "F_PM_0106";
+                cre.Name = "SetFPM0106GLCode";
+                cre.Data = _data;
+
+                // 根据注浆日期、成型线获取所有可注浆模具信息
+                ServiceResultEntity sre = this.DoAsync<ServiceResultEntity>(() =>
+                    {
+                        return PMModuleProxyNew.Service.HandleRequest(cre);
+                    }
+                );
+
+                // 异常情况处理
+                if (sre.Status == Constant.ServiceResultStatus.Success)
+                {
+                    _data = null;
+                    this.txtGroutingLineCode.Clear();
+                    this.txtTextBox1.Clear();
+
+                    this.btnOK.Enabled = false;
+                    return;
+                }
+
+                MessageBox.Show(sre.Message, this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+
+            }
+            catch (Exception ex)
+            {
+                // 对异常进行共通处理
+                ExceptionManager.HandleEventException(this.ToString(),
+                    MethodBase.GetCurrentMethod().Name, this.Text, ex);
+            }
+        }
+
+        /// <summary>
+        /// 关闭按钮按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnClose_Click(object sender, System.EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+            this.Close();
+        }
+        #endregion
+
+        #region 私有方法/函数
+        /// <summary>
+        /// 初始化控件
+        /// </summary>
+        private void InitializeControls()
+        {
+            this.btnSearch.Text = ButtonText.BTN_SEARCH;
+            this.btnOK.Text = ButtonText.BTN_OK;
+            this.btnCancel.Text = ButtonText.BTN_CANCEL;
+        }
+        #endregion
+
+        private void txtGroutingLineCode_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == Constant.SYSTEM_KEYBOARD_ENTER_VALUE)
+            {
+                btnSearch_Click(null, null);
+            }
+        }
+    }
+}

DK.Client/PMModule/F_PM_0106.resx

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="lblGroutingLineCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAABeUlE
+        QVR4Xu3YQQ0AMAwDsfKnukkrhPE42RjyOGUOhMyFkHkQMgshGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRo
+        aFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMU
+        PzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFo
+        UiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4
+        oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRyk
+        GDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVD
+        k6KhSTFoUiQHKQZNyO4HCToumLCnZVwAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAjklEQVRoQ+3QoRHEIBRAwWsQiY6jBSyK
+        glIBveBo4t+cuMlEw3NPbAP7KaWE9vXeY4wRa60w9RBTAaYCTAWYCjAVYCrAVICpAFMBpgJMBZgKeKVe
+        1xXa11oz9TRTAaYCaq1Pas45tO+fOuc09RRTAaYCTAWYCjAVYCrAVICpgF/qfd+mnvRKTSmF9j2pM748
+        hkQFBncKsAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnOK.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAjklEQVRoQ+3QoRHEIBRAwWsQiY6jBSyK
+        glIBveBo4t+cuMlEw3NPbAP7KaWE9vXeY4wRa60w9RBTAaYCTAWYCjAVYCrAVICpAFMBpgJMBZgKeKVe
+        1xXa11oz9TRTAaYCaq1Pas45tO+fOuc09RRTAaYCTAWYCjAVYCrAVICpgF/qfd+mnvRKTSmF9j2pM748
+        hkQFBncKsAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAjklEQVRoQ+3QoRHEIBRAwWsQiY6jBSyK
+        glIBveBo4t+cuMlEw3NPbAP7KaWE9vXeY4wRa60w9RBTAaYCTAWYCjAVYCrAVICpAFMBpgJMBZgKeKVe
+        1xXa11oz9TRTAaYCaq1Pas45tO+fOuc09RRTAaYCTAWYCjAVYCrAVICpgF/qfd+mnvRKTSmF9j2pM748
+        hkQFBncKsAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
+  </metadata>
+</root>

DK.Client/PMModule/PMModule.csproj

@@ -109,6 +109,12 @@
     <Compile Include="F_PM_0102.Designer.cs">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </Compile>
+    <Compile Include="F_PM_0106.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_PM_0106.Designer.cs">
+      <DependentUpon>F_PM_0106.cs</DependentUpon>
+    </Compile>
     <Compile Include="F_PM_0504.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -749,6 +755,9 @@
     <EmbeddedResource Include="F_PM_0102.resx">
       <DependentUpon>F_PM_0102.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="F_PM_0106.resx">
+      <DependentUpon>F_PM_0106.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="F_PM_0504.resx">
       <DependentUpon>F_PM_0504.cs</DependentUpon>
     </EmbeddedResource>

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -2698,6 +2698,286 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
 
         #endregion 条码绑定
 
+        #region 取消最后注浆
+        /// <summary>
+        /// 验证成型线编码是否能取消最后注浆
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="glcode"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity CheckFPM0106GLCode(SUserInfo user, string glcode)
+        {
+            ServiceResultEntity sre = new ServiceResultEntity();
+            if (string.IsNullOrWhiteSpace(glcode))
+            {
+                sre.Status = Constant.ServiceResultStatus.Other;
+                sre.OtherStatus = 1;
+                sre.Message = $"成型线【{glcode}】不存在";
+                return sre;
+            }
+            IDBConnection conn = null;
+            try
+            {
+                conn = ClsDbFactory.CreateDBConnection(Basics.DataAccess.DataBaseType.ORACLE, DataManager.ConnectionString);
+                //输入成型线号，1.验证是否存在、2.最后注浆日期、批次是否存在，3.是否有报损、是否绑定条码。 返回【最后注浆日期、批次】。
+
+                string sqlString = "select GL.GroutingLineID\n" +
+                "      ,gl.GroutingLineCode\n" +
+                "      ,gl.GroutingLineName\n" +
+                "      ,GL.LastGroutingDate\n" +
+                "      ,GL.LastGroutingBatchNo\n" +
+                "      ,gd.usercode\n" +
+                "      ,gd.GroutingDailyID\n" +
+                "  from TP_PC_GroutingLine gl\n" +
+                "  left join TP_PM_GroutingDaily gd\n" +
+                "    on gd.GroutingLineID = gl.GroutingLineID\n" +
+                "   and gd.GroutingDate = GL.LastGroutingDate\n" +
+                "   and gd.GroutingBatchNo = gl.LastGroutingBatchNo\n" +
+                " where gl.valueflag = '1'\n" +
+                "   and gl.GroutingLineCode = :glcode";
+                OracleParameter[] ps = new OracleParameter[]
+                {
+                    new OracleParameter(":glcode", glcode),
+                };
+                DataTable data = conn.GetSqlResultToDt(sqlString, ps);
+                if (data == null || data.Rows.Count == 0)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 1;
+                    sre.Message = $"成型线【{glcode}】不存在";
+                    return sre;
+                }
+                sre.Data = new DataSet();
+                sre.Data.Tables.Add(data);
+
+                object objgdid = data.Rows[0]["GroutingDailyID"];
+                if (objgdid == null || objgdid == DBNull.Value)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 2;
+                    sre.Message = $"成型线【{glcode}】未注浆";
+                    return sre;
+                }
+                int gdid = Convert.ToInt32(objgdid);
+
+                sqlString = "select count(gdd.GroutingDailyDetailID) dc\n" +
+                "  from TP_PM_GroutingDailyDetail gdd\n" +
+                " where gdd.valueflag = '1'\n" +
+                "   and gdd.GroutingDailyID = :gdid\n" +
+                "   and (gdd.ScrapFlag <> '0' or gdd.barcode is not null)";
+                ps = new OracleParameter[]
+                {
+                    new OracleParameter(":gdid", gdid),
+                };
+                int dcount = Convert.ToInt32(conn.GetSqlResultToObj(sqlString, ps));
+                if (dcount > 0)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 3;
+                    sre.Message = $"成型线【{glcode}】最后注浆登记中有已报损或绑定条码的注浆明细";
+                    return sre;
+                }
+
+                // 'S_PM_022', '注浆编辑限制天数' add by chenxy 2018-12-15 begin
+                sre.Result = 1;
+                string spm022 = conn.GetSqlResultToStr("select ss.SETTINGVALUE from tp_mst_systemsetting ss where ss.SETTINGCODE = 'S_PM_022' and ss.AccountID = " + user.AccountID);
+                int spm022Value = 0;
+                if (!string.IsNullOrWhiteSpace(spm022) && int.TryParse(spm022, out spm022Value) && spm022Value > 0)
+                {
+                    DateTime tDate = DateTime.Now.Date;
+                    DateTime lastDate = tDate.AddDays(1 - spm022Value);
+                    DateTime gData = (DateTime)data.Rows[0]["LastGroutingDate"];
+                    if (gData < lastDate || gData > tDate)
+                    {
+                        sre.Status = Constant.ServiceResultStatus.Other;
+                        sre.OtherStatus = 9;
+                        sre.Message = string.Format("允许注浆编辑的日期范围【{0:yyyy-MM-dd}】-【{1:yyyy-MM-dd}】", lastDate, tDate);
+                        return sre;
+                    }
+                }
+                // 'S_PM_022', '注浆编辑限制天数' add by chenxy 2018-12-15 end
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                if (conn != null &&
+                    conn.ConnState == ConnectionState.Open)
+                {
+                    conn.Close();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 验证成型线编码是否能取消最后注浆
+        /// </summary>
+        /// <param name="user"></param>
+        /// <param name="glcode"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity SetFPM0106GLCode(SUserInfo user, ClientRequestEntity cre)
+        {
+            string glcode = cre.Data.Tables[0].Rows[0]["GroutingLineCode"] + "";
+            int glID = Convert.ToInt32(cre.Data.Tables[0].Rows[0]["GroutingLineID"]);
+            int gdID = Convert.ToInt32(cre.Data.Tables[0].Rows[0]["GroutingDailyID"]);
+            ServiceResultEntity sre = new ServiceResultEntity();
+            if (string.IsNullOrWhiteSpace(glcode))
+            {
+                sre.Status = Constant.ServiceResultStatus.Other;
+                sre.OtherStatus = 1;
+                sre.Message = $"成型线【{glcode}】不存在";
+                return sre;
+            }
+            IDBTransaction conn = null;
+            try
+            {
+                conn = ClsDbFactory.CreateDBTransaction(Basics.DataAccess.DataBaseType.ORACLE, DataManager.ConnectionString);
+                //输入成型线号，1.验证是否存在、2.最后注浆日期、批次是否存在，3.是否有报损、是否绑定条码。 返回【最后注浆日期、批次】。
+
+                string sqlString = "select GL.GroutingLineID\n" +
+                //"      ,gl.GroutingLineCode\n" +
+                //"      ,gl.GroutingLineName\n" +
+                //"      ,nvl(GL.LastGroutingDate, to_date('1900-01-01','yyyy-mm-dd')) LastGroutingDate\n" +
+                //"      ,nvl(GL.LastGroutingBatchNo,0) LastGroutingBatchNo\n" +
+                //"      ,gd.usercode\n" +
+                "      ,gd.GroutingDailyID\n" +
+                "  from TP_PC_GroutingLine gl\n" +
+                " inner join TP_PM_GroutingDaily gd\n" +
+                "    on gd.GroutingLineID = gl.GroutingLineID\n" +
+                "   and gd.GroutingDate = GL.LastGroutingDate\n" +
+                "   and gd.GroutingBatchNo = gl.LastGroutingBatchNo\n" +
+                " where gl.valueflag = '1'\n" +
+                "   and gl.GroutingLineID = :glID\n" +
+                " for update";
+                OracleParameter[] ps = new OracleParameter[]
+                {
+                    new OracleParameter(":glID", glID),
+                };
+                DataTable data = conn.GetSqlResultToDt(sqlString, ps);
+                if (data == null || data.Rows.Count == 0)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 1;
+                    sre.Message = $"成型线【{glcode}】不存在";
+                    return sre;
+                }
+                //sre.Data = new DataSet();
+                //sre.Data.Tables.Add(data);
+
+                //DateTime lgd = Convert.ToDateTime(data.Rows[0]["LastGroutingDate"]);
+                //int lgb = Convert.ToInt32(data.Rows[0]["LastGroutingBatchNo"]);
+
+                //if (lgd != Convert.ToDateTime(cre.Data.Tables[0].Rows[0]["LastGroutingDate"]) ||
+                //    lgb != Convert.ToInt32(cre.Data.Tables[0].Rows[0]["LastGroutingBatchNo"]))
+                //{
+                //    sre.Status = Constant.ServiceResultStatus.Other;
+                //    sre.OtherStatus = 2;
+                //    sre.Message = $"成型线【{glcode}】最后注浆日期和批次已变更";
+                //    return sre;
+                //}
+                int lgdid = Convert.ToInt32(data.Rows[0]["GroutingDailyID"]);
+                if (lgdid != gdID)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 2;
+                    sre.Message = $"成型线【{glcode}】最后注浆日期和批次已变更";
+                    return sre;
+                }
+
+                sqlString = "select count(gdd.GroutingDailyDetailID) dc\n" +
+                "  from TP_PM_GroutingDailyDetail gdd\n" +
+                " where gdd.valueflag = '1'\n" +
+                "   and gdd.GroutingDailyID = :gdid\n" +
+                "   and (gdd.ScrapFlag <> '0' or gdd.barcode is not null)";
+                ps = new OracleParameter[]
+                {
+                    new OracleParameter(":gdid", gdID),
+                };
+                int dcount = Convert.ToInt32(conn.GetSqlResultToObj(sqlString, ps));
+                if (dcount > 0)
+                {
+                    sre.Status = Constant.ServiceResultStatus.Other;
+                    sre.OtherStatus = 3;
+                    sre.Message = $"成型线【{glcode}】最后注浆登记中有已报损或绑定条码的注浆明细";
+                    return sre;
+                }
+
+                // 'S_PM_022', '注浆编辑限制天数' add by chenxy 2018-12-15 begin
+                //sre.Result = 1;
+                //string spm022 = conn.GetSqlResultToStr("select ss.SETTINGVALUE from tp_mst_systemsetting ss where ss.SETTINGCODE = 'S_PM_022' and ss.AccountID = " + user.AccountID);
+                //int spm022Value = 0;
+                //if (!string.IsNullOrWhiteSpace(spm022) && int.TryParse(spm022, out spm022Value) && spm022Value > 0)
+                //{
+                //    DateTime tDate = DateTime.Now.Date;
+                //    DateTime lastDate = tDate.AddDays(1 - spm022Value);
+                //    DateTime gData = (DateTime)data.Rows[0]["LastGroutingDate"];
+                //    if (gData < lastDate || gData > tDate)
+                //    {
+                //        sre.Status = Constant.ServiceResultStatus.Other;
+                //        sre.OtherStatus = 9;
+                //        sre.Message = string.Format("允许注浆编辑的日期范围【{0:yyyy-MM-dd}】-【{1:yyyy-MM-dd}】", lastDate, tDate);
+                //        return sre;
+                //    }
+                //}
+                // 'S_PM_022', '注浆编辑限制天数' add by chenxy 2018-12-15 end
+
+                //2.然后取消注浆，3.并valueflag=0。4.修改成型线的最后注浆日期、批次。
+
+                string sql =
+                "UPDATE TP_PM_GroutingDailyDetail" +
+                "   SET GroutingCount = CASE" +
+                "                       WHEN GroutingFlag = '1'" +
+                "                       THEN GroutingCount - 1" +
+                "                       ELSE GroutingCount END," +
+                "       GroutingFlag = '0'," +
+                "       valueflag = '0'," +
+                "       UpdateUserID = :UpdateUserID" +
+                " WHERE GroutingDailyID = :gdid and valueflag = '1'";
+                ps = new OracleParameter[]
+                {
+                    new OracleParameter(":UpdateUserID", user.UserID),
+                    new OracleParameter(":gdid", gdID),
+                };
+                int r = conn.ExecuteNonQuery(sql, ps);
+
+                sql = "update TP_PM_GroutingDaily gd set gd.valueflag='0', updateuserid = :UpdateUserID where gd.GroutingDailyID = :gdid";
+                r = conn.ExecuteNonQuery(sql, ps);
+
+                sql = "update TP_PC_GroutingLine gl\n" +
+                "   set (gl.LastGroutingDate, gl.LastGroutingBatchNo) =\n" +
+                "       (select gd.GroutingDate, gd.GroutingBatchNo\n" +
+                "          from TP_PM_GroutingDaily gd\n" +
+                "         where gd.GroutingDailyID =\n" +
+                "               (select max(gm.GroutingDailyID)\n" +
+                "                  from TP_PM_GroutingDaily gm\n" +
+                "                 where gm.GroutingLineID = :glid\n" +
+                "                   and gm.valueflag = '1'))\n" +
+                "      ,gl.UpdateUserID = :UpdateUserID\n" +
+                " where gl.GroutingLineID = :glid";
+                r = conn.ExecuteNonQuery(sql, ps);
+
+                conn.Commit();
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            finally
+            {
+                if (conn != null &&
+                    conn.ConnState == ConnectionState.Open)
+                {
+                    conn.Disconnect();
+                }
+            }
+        }
+
+
+        #endregion
         #endregion 注浆管理
 
         #region 条码管理

WCF.Service/WCF.Services/PMModuleServiceNew.cs

@@ -308,6 +308,21 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                 }
                 #endregion
 
+                #region 取消最后注浆
+                if (cre.NameSpace == "F_PM_0106")
+                {
+                    if ("CheckFPM0106GLCode" == cre.Name)
+                    {
+                        string glcode = cre.Properties["glcode"] + "";
+                        return ServiceInvoker.Invoke(this, () => PMModuleLogic.CheckFPM0106GLCode(this.SUserInfo, glcode));
+                    }
+                    if ("SetFPM0106GLCode" == cre.Name)
+                    {
+                        return ServiceInvoker.Invoke(this, () => PMModuleLogic.SetFPM0106GLCode(this.SUserInfo, cre));
+                    }
+                }
+                #endregion
+
                 #region 生产管理
                 // 集中采集的结束工序（包装装板）验证参数（商标、型号、数量）
                 if (cre.NameSpace == "FinishedLoadingCar")