注浆登记选择成型线时，增加成型班长工号

DK.Basics/BaseControls/DataGridView/C_DataGridView.cs

@@ -986,6 +986,12 @@ namespace Dongke.IBOSS.PRD.Basics.BaseControls
             //// Ensures that all rows are added unshared by listening to the CollectionChanged event.
             //base.Rows.CollectionChanged += delegate(object sender, System.ComponentModel.CollectionChangeEventArgs e) { };
             base.ClipboardCopyMode = DataGridViewClipboardCopyMode.Disable;
+
+            // 周兴 2020-02-05 增加双通道缓冲
+            Type type = this.GetType();
+            System.Reflection.PropertyInfo pi = type.GetProperty("DoubleBuffered",
+                System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            pi.SetValue(this, true, null);
         }
         #endregion
 

DK.Client/PMModule/F_PM_0104_1.cs

@@ -128,6 +128,7 @@ namespace Dongke.IBOSS.PRD.Client.PMModule
                 se.GroutingLineCode = this.txtGroutingLineCode.Text;
                 se.GroutingLineName = this.txtGroutingLineName.Text;
                 se.GroutingUserCode = this.txtUserCode.Text;
+                se.Monitorcode = this.txtMUserCode.Text;
 
                 this.dgvGroutingLine.DataSource = null;
                 this.DataSource = null;

DK.Client/PMModule/F_PM_0104_1.resx

@@ -121,37 +121,27 @@
   <data name="lblGroutingLineCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAACo0lE
-        QVR4Xu3YgQkAIAwDwe6/qkIdwT2ec4O8gT6Z4yEQIjDXQyBEYNZDIERgnodAiMCE9EkUBI5CK0GKAOUI
-        nVtR3lNoLUgRoBypgyuMHTq0wYpyrx06tMGKssuhUwYpDIemnSkCCp36TmEohyudIqDQqe8UhnK40ikC
-        dmjjbYqAHdp4myLAoWlnigCHThmkMAqtAykClCN1cIVRaB1IEaAcqYMrjB06tcIKY4dOrbDCcOiUQQrD
-        oWlnioBCp75TGMrhSqcIKHTqO4WhHK50ioAd2nSbImCHNt2mCHBo2pkiwKFTBimMQutAigDlSB1cYRRa
-        B1IEKEfq4Apjh06tsMLYoVMrrDAcOmWQwnBo2pkioNCp7xSGcrjSKQIKnfpOYSiHK50iYIc23aYI2KFN
-        tykCHJp2pghw6JRBCqPQOpAiQDlSB1cYhdaBFAHKkTq4wtihUyusMHbo1AorDIdOGaQwHJp2pggodOo7
-        haEcrnSKgEKnvlMYyuFKpwjYoU23KQJ2aNNtigCHpp0pAhw6ZZDCKLQOpAhQjtTBFUahdSBFgHKkDq4w
-        dujUCiuMHTq1wgrDoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo022KgB3adJsiwKFpZ4oA
-        h04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK4UqnCCh0
-        6juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dOrbDC2KFT
-        K6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiUQQqj0DqQ
-        IkA5UgdXGIXWgRSBDwk6LphFyLNeAAAAAElFTkSuQmCC
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAABeUlE
+        QVR4Xu3YQQ0AMAwDsfKnukkrhPE42RjyOGUOhMyFkHkQMgshGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRo
+        aFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMU
+        PzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFo
+        UiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4
+        oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRyk
+        GDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVD
+        k6KhSTFoUiQHKQZNyO4HCToumLCnZVwAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="lblGroutingLineName.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAACo0lE
-        QVR4Xu3YgQkAIAwDwe6/qkIdwT2ec4O8gT6Z4yEQIjDXQyBEYNZDIERgnodAiMCE9EkUBI5CK0GKAOUI
-        nVtR3lNoLUgRoBypgyuMHTq0wYpyrx06tMGKssuhUwYpDIemnSkCCp36TmEohyudIqDQqe8UhnK40ikC
-        dmjjbYqAHdp4myLAoWlnigCHThmkMAqtAykClCN1cIVRaB1IEaAcqYMrjB06tcIKY4dOrbDCcOiUQQrD
-        oWlnioBCp75TGMrhSqcIKHTqO4WhHK50ioAd2nSbImCHNt2mCHBo2pkiwKFTBimMQutAigDlSB1cYRRa
-        B1IEKEfq4Apjh06tsMLYoVMrrDAcOmWQwnBo2pkioNCp7xSGcrjSKQIKnfpOYSiHK50iYIc23aYI2KFN
-        tykCHJp2pghw6JRBCqPQOpAiQDlSB1cYhdaBFAHKkTq4wtihUyusMHbo1AorDIdOGaQwHJp2pggodOo7
-        haEcrnSKgEKnvlMYyuFKpwjYoU23KQJ2aNNtigCHpp0pAhw6ZZDCKLQOpAhQjtTBFUahdSBFgHKkDq4w
-        dujUCiuMHTq1wgrDoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo022KgB3adJsiwKFpZ4oA
-        h04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK4UqnCCh0
-        6juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dOrbDC2KFT
-        K6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiUQQqj0DqQ
-        IkA5UgdXGIXWgRSBDwk6LphFyLNeAAAAAElFTkSuQmCC
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAABeUlE
+        QVR4Xu3YQQ0AMAwDsfKnukkrhPE42RjyOGUOhMyFkHkQMgshGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRo
+        aFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMU
+        PzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFo
+        UiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4
+        oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRyk
+        GDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVD
+        k6KhSTFoUiQHKQZNyO4HCToumLCnZVwAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="GroutingLineID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -184,6 +174,9 @@
   <metadata name="GroutingUserCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Monitorcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="LastGroutingDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -205,58 +198,62 @@
   <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAvElEQVRoQ+3YoRHEIBBGYRpEonG0gEVR
-        EBXQC44mNoO4y53eXZHJEzTwzf8YklBKEY7eoPcuc07Ze0sAVA96DEF1qBNUUG3y9L7mWCpLZamvfZ6R
-        P/mTP/nzRWVXAXcqd6rdmjw/AP6WmnMWjt6gtXb/pQJUD3oMQXWoE1QH1FrrnX9KSTh6gw/qWksCoHrQ
-        YwiqQ52ggmqTp/c1x1JZKkt97fOM/Mn/OfmPMYTHv+FiT/5f1BijcPQGv6gXPIZEBUUbIHIAAAAASUVO
-        RK5CYII=
+        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
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAvElEQVRoQ+3YoRHEIBBGYRpEonG0gEVR
-        EBXQC44mNoO4y53eXZHJEzTwzf8YklBKEY7eoPcuc07Ze0sAVA96DEF1qBNUUG3y9L7mWCpLZamvfZ6R
-        P/mTP/nzRWVXAXcqd6rdmjw/AP6WmnMWjt6gtXb/pQJUD3oMQXWoE1QH1FrrnX9KSTh6gw/qWksCoHrQ
-        YwiqQ52ggmqTp/c1x1JZKkt97fOM/Mn/OfmPMYTHv+FiT/5f1BijcPQGv6gXPIZEBUUbIHIAAAAASUVO
-        RK5CYII=
+        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
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAvElEQVRoQ+3YoRHEIBBGYRpEonG0gEVR
-        EBXQC44mNoO4y53eXZHJEzTwzf8YklBKEY7eoPcuc07Ze0sAVA96DEF1qBNUUG3y9L7mWCpLZamvfZ6R
-        P/mTP/nzRWVXAXcqd6rdmjw/AP6WmnMWjt6gtXb/pQJUD3oMQXWoE1QH1FrrnX9KSTh6gw/qWksCoHrQ
-        YwiqQ52ggmqTp/c1x1JZKkt97fOM/Mn/OfmPMYTHv+FiT/5f1BijcPQGv6gXPIZEBUUbIHIAAAAASUVO
-        RK5CYII=
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAjklEQVRoQ+3QoRHEIBRAwWsQiY6jBSyK
+        glIBveBo4t+cuMlEw3NPbAP7KaWE9vXeY4wRa60w9RBTAaYCTAWYCjAVYCrAVICpAFMBpgJMBZgKeKVe
+        1xXa11oz9TRTAaYCaq1Pas45tO+fOuc09RRTAaYCTAWYCjAVYCrAVICpgF/qfd+mnvRKTSmF9j2pM748
+        hkQFBncKsAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="lblUserCode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAACo0lE
-        QVR4Xu3YgQkAIAwDwe6/qkIdwT2ec4O8gT6Z4yEQIjDXQyBEYNZDIERgnodAiMCE9EkUBI5CK0GKAOUI
-        nVtR3lNoLUgRoBypgyuMHTq0wYpyrx06tMGKssuhUwYpDIemnSkCCp36TmEohyudIqDQqe8UhnK40ikC
-        dmjjbYqAHdp4myLAoWlnigCHThmkMAqtAykClCN1cIVRaB1IEaAcqYMrjB06tcIKY4dOrbDCcOiUQQrD
-        oWlnioBCp75TGMrhSqcIKHTqO4WhHK50ioAd2nSbImCHNt2mCHBo2pkiwKFTBimMQutAigDlSB1cYRRa
-        B1IEKEfq4Apjh06tsMLYoVMrrDAcOmWQwnBo2pkioNCp7xSGcrjSKQIKnfpOYSiHK50iYIc23aYI2KFN
-        tykCHJp2pghw6JRBCqPQOpAiQDlSB1cYhdaBFAHKkTq4wtihUyusMHbo1AorDIdOGaQwHJp2pggodOo7
-        haEcrnSKgEKnvlMYyuFKpwjYoU23KQJ2aNNtigCHpp0pAhw6ZZDCKLQOpAhQjtTBFUahdSBFgHKkDq4w
-        dujUCiuMHTq1wgrDoVMGKQyHpp0pAgqd+k5hKIcrnSKg0KnvFIZyuNIpAnZo022KgB3adJsiwKFpZ4oA
-        h04ZpDAKrQMpApQjdXCFUWgdSBGgHKmDK4wdOrXCCmOHTq2wwnDolEEKw6FpZ4qAQqe+UxjK4UqnCCh0
-        6juFoRyudIqAHdp0myJghzbdpghwaNqZIsChUwYpjELrQIoA5UgdXGEUWgdSBChH6uAKY4dOrbDC2KFT
-        K6wwHDplkMJwaNqZIqDQqe8UhnK40ikCCp36TmEohyudImCHNt2mCNihTbcpAhyadqYIcOiUQQqj0DqQ
-        IkA5UgdXGIXWgRSBDwk6LphFyLNeAAAAAElFTkSuQmCC
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAr/AAAK/wE0YpqCAAABeUlE
+        QVR4Xu3YQQ0AMAwDsfKnukkrhPE42RjyOGUOhMyFkHkQMgshGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRo
+        aFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMU
+        PzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFo
+        UiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRykGDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4
+        oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVDk6KhSTFoUiQHKQZNiuQgxQ9Nih+aFA1NioYmxaBJkRyk
+        GDQpkoMUPzQpfmhSNDQpGpoUgyZFcpBi0KRIDlL80KT4oUnR0KRoaFIMmhTJQYpBkyI5SPFDk+KHJkVD
+        k6KhSTFoUiQHKQZNyO4HCToumLCnZVwAAAAASUVORK5CYII=
 </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="c_Label1.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>
   <metadata name="GUUserID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -271,11 +268,10 @@
   <data name="btnAdaptive.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAvElEQVRoQ+3YoRHEIBBGYRpEonG0gEVR
-        EBXQC44mNoO4y53eXZHJEzTwzf8YklBKEY7eoPcuc07Ze0sAVA96DEF1qBNUUG3y9L7mWCpLZamvfZ6R
-        P/mTP/nzRWVXAXcqd6rdmjw/AP6WmnMWjt6gtXb/pQJUD3oMQXWoE1QH1FrrnX9KSTh6gw/qWksCoHrQ
-        YwiqQ52ggmqTp/c1x1JZKkt97fOM/Mn/OfmPMYTHv+FiT/5f1BijcPQGv6gXPIZEBUUbIHIAAAAASUVO
-        RK5CYII=
+        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">

DK.Service/PMModuleService/PMModuleLogic.cs

@@ -713,7 +713,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                     "       decode(GMT.CanManyTimes, '1', decode(GL.LastGroutingDate, null, 1, :GroutingDate, NVL(GL.LastGroutingBatchNo, 1) + 1, 1), 1) GroutingBatchNo," +
                     //"       GMT.CanManyTimes," +
                     "       GL.monitorid," +
-                    "       mu.username || '[' || mu.usercode || ']' monitorcode," +
+                    "       decode(mu.userid,null,null, mu.username || '[' || mu.usercode || ']') monitorcode," +
                     "       GMT.GMouldTypeID," +
                     "       GMT.GMouldTypeName," +
                     // 成型线变更 ver41 by chenxy end
@@ -835,8 +835,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                     "       GL.LastGroutingDate," +
                     "       GL.LastGroutingBatchNo," +
                     "       GL.monitorid," +
-                    "       mu.usercode monitorcode," +
-                    //"       mu.username || '[' || mu.usercode || ']' monitorcode," +
+                    //"       mu.usercode monitorcode," +
+                    "       decode(mu.userid,null,null, mu.username || '[' || mu.usercode || ']') monitorcode," +
                     "       decode(GMT.CanManyTimes, '1', NULL, 1) GroutingNum," +
                     "       GMT.CanManyTimes" +
                     // 成型线变更 ver41 by chenxy end
@@ -906,6 +906,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleService
                         sql.Append(" AND INSTR(U.UserCode, :GroutingUserCode) > 0");
                         parameters.Add(new OracleParameter(":GroutingUserCode", OracleDbType.NVarchar2, se.GroutingUserCode, ParameterDirection.Input));
                     }
+                    // 成型班长
+                    if (!string.IsNullOrEmpty(se.Monitorcode))
+                    {
+                        sql.Append(" AND INSTR(mu.UserCode, :Monitorcode) > 0");
+                        parameters.Add(new OracleParameter(":Monitorcode", OracleDbType.NVarchar2, se.Monitorcode, ParameterDirection.Input));
+                    }
                     // 成型线类别
                     if (se.GMouldTypeID.HasValue)
                     {

WCF.Service/WCF.DataModels/SearchEntity/PM/FPM0104_SE.cs

@@ -77,7 +77,17 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
 		{
 			get;
 			set;
-		}
+        }
+
+        /// <summary>
+        /// 成型班长
+        /// </summary>
+        [DataMember]
+        public string Monitorcode
+        {
+            get;
+            set;
+        }
 
         /// <summary>
         /// 注浆批次