Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -39,6 +39,8 @@ namespace UAS_MES.Make
         //保存TSN编号
         string ms_id = null;
 
+        string PR_CHECKCARTONW = "0";
+
         bool pr_change = false;
 
         Thread InitPrint;
@@ -172,6 +174,12 @@ namespace UAS_MES.Make
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
+                            PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sncode.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
+                            if (PR_CHECKCARTONW != "0")
+                            {
+                                OperateResult.AppendText(">>彩盒" + sncode.Text + "当前处于称重工序，无法在此界面采集，需去彩盒称重界面进行采集\n", Color.Black, sncode);
+                                return;
+                            }
                             BaseUtil.SetFormValue(this.Controls, dt);
                             LockMakeCode.Checked = true;
                             //提示用户“<<工单号：取ma_makecode”

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.Designer.cs

@@ -233,7 +233,7 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ma_softversion.Location = new System.Drawing.Point(911, 56);
+            this.ma_softversion.Location = new System.Drawing.Point(907, 68);
             this.ma_softversion.Name = "ma_softversion";
             this.ma_softversion.Size = new System.Drawing.Size(0, 31);
             this.ma_softversion.TabIndex = 150;
@@ -285,9 +285,8 @@
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.CutLength = null;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(543, 26);
+            this.ma_prodcode.Location = new System.Drawing.Point(550, 26);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 24;
@@ -297,7 +296,7 @@
             this.pr_detail.AutoSize = true;
             this.pr_detail.CutLength = null;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(911, 14);
+            this.pr_detail.Location = new System.Drawing.Point(906, 26);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail.MaximumSize = new System.Drawing.Size(164, 0);
             this.pr_detail.Name = "pr_detail";

UAS-MES/FunctionCode/Make/Make_SeqTransform.Designer.cs

@@ -301,7 +301,6 @@
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.ma_prodcode.Location = new System.Drawing.Point(576, 26);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.ma_prodcode.MaximumSize = new System.Drawing.Size(164, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 31);
             this.ma_prodcode.TabIndex = 94;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1380,6 +1380,9 @@ namespace UAS_MES.PublicMethod
                 case "MIX":
                     break;
                 default:
+                    prodcode = dh.getFieldDataByCondition("package", "pa_prodcode", "pa_outboxcode='" + outboxcode + "'").ToString();
+                    error = ">>当前箱" + outboxcode + "对应物料" + prodcode + "没有维护装箱规则";
+                    return false;
                     break;
             }
             error = "";