恒洁 三水 半成品质量登记 只选交坯（成型）或干补工序

DK.Client/PMModule/F_PM_2202.Designer.cs

@@ -433,6 +433,7 @@
             this.dgvProductionData.DynamicColumnName = "";
             this.dgvProductionData.EnableHeadersVisualStyles = false;
             this.dgvProductionData.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvProductionData.FormatQuantityColumns = null;
             this.dgvProductionData.HorizontalMergeColumn = null;
             this.dgvProductionData.IsAutoCountSum = true;
             this.dgvProductionData.IsAutoResizeColumns = false;
@@ -696,6 +697,7 @@
             this.dgvDefect.DynamicColumnName = "";
             this.dgvDefect.EnableHeadersVisualStyles = false;
             this.dgvDefect.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDefect.FormatQuantityColumns = null;
             this.dgvDefect.HorizontalMergeColumn = null;
             this.dgvDefect.IsAutoCountSum = true;
             this.dgvDefect.IsAutoResizeColumns = false;
@@ -930,6 +932,7 @@
             this.dgvDefectStaff.DynamicColumnName = "";
             this.dgvDefectStaff.EnableHeadersVisualStyles = false;
             this.dgvDefectStaff.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgvDefectStaff.FormatQuantityColumns = null;
             this.dgvDefectStaff.HorizontalMergeColumn = null;
             this.dgvDefectStaff.IsAutoCountSum = true;
             this.dgvDefectStaff.IsAutoResizeColumns = false;

DK.Client/PMModule/F_PM_2202.resx

@@ -168,19 +168,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="UjobsID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -191,25 +186,26 @@
   </metadata>
   <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="odlgFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>262, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>52</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -3523,7 +3523,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                     --left join TP_PC_Procedure
                                     --on TP_PM_ProductionDataIn.ProcedureID=TP_PC_Procedure.ProcedureID
                                     where TP_PM_ProductionDataIn.BarCode=:BarCode and TP_PM_ProductionDataIn.valueflag = '1'
-and (TP_PM_ProductionDataIn.modeltype <> 5 or (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0')))
+and TP_PM_ProductionDataIn.modeltype=8 or (TP_PM_ProductionDataIn.modeltype = 5 and (exists (select 1 from tp_pm_groutingdailydetail gdd where gdd.groutingdailydetailID=TP_PM_ProductionDataIn.groutingdailydetailID and gdd.SPECIALREPAIRFLAG='0')))
                                     order by TP_PM_ProductionDataIn.ProductionDataID
                                     ";
 				// 干补后 半检 不能选成型责任