Browse Source

BUG修改

章政 6 years ago
parent
commit
0546e726d7

+ 2 - 2
UAS-出货标签管理(贸易版)/PublicMethod/Print.cs

@@ -143,7 +143,7 @@ namespace UAS_LabelMachine.PublicMethod
                 {
                     GroupByCondition += "pd_ordercode,";
                 }
-                if (iCustProdCode || iCustPo || iDC || iLotNo)
+                if (iCustProdCode || iCustPo || iDC || iLotNo || iOrderCode)
                 {
                     GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
                 }
@@ -360,7 +360,7 @@ namespace UAS_LabelMachine.PublicMethod
                 {
                     GroupByCondition += "pd_ordercode,";
                 }
-                if (iCustProdCode || iCustPo || iDC || iLotNo)
+                if (iCustProdCode || iCustPo || iDC || iLotNo || iOrderCode)
                 {
                     GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
                 }

File diff suppressed because it is too large
+ 183 - 427
UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs


+ 3 - 0
UAS-出货标签管理(贸易版)/UAS_出货标签管理.resx

@@ -156,6 +156,9 @@
   <metadata name="pr_midboxcapacity_user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_ordercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pib_madein.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Some files were not shown because too many files changed in this diff