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

UAS-MES/FunctionCode/Make/Make_BigBoxWeight.cs

@@ -239,15 +239,20 @@ namespace UAS_MES.Make
 
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void Make_BigBoxWeight_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -215,9 +215,13 @@ namespace UAS_MES.Make
         //停止进程，关闭串口
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         //关闭窗口的时候停止进程，不再读取串口数据
@@ -225,6 +229,7 @@ namespace UAS_MES.Make
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -45,10 +45,11 @@ namespace UAS_MES.Make
 
         private void Make_CollectBTMAC_Load(object sender, EventArgs e)
         {
-            sncode.Focus();
-            dh = new DataHelper();
+
             asc.controllInitializeSize(this);
             printcount = 0;
+            sncode.Focus();
+            dh = new DataHelper();
         }
 
         private void Make_CollectBTMAC_Activated(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -39,9 +39,9 @@ namespace UAS_MES.Make
 
         private void Make_CollectNetCode_Load(object sender, EventArgs e)
         {
+            asc.controllInitializeSize(this);
             sncode.Focus();
             dh = new DataHelper();
-            asc.controllInitializeSize(this);
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -53,18 +53,16 @@ namespace UAS_MES.Make
 
         private void Make_ColorBoxLabelPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
+
             sncode.Focus();
             asc.controllInitializeSize(this);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
-
             //设置锁定工单
             LockMakeCode.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(LockMakeCode);
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
@@ -72,8 +70,8 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
-
             OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -56,14 +56,11 @@ namespace UAS_MES.Make
 
         private void Make_ColorBoxLoadPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            code.Focus();
             asc.controllInitializeSize(this);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本";
@@ -72,9 +69,10 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "pr_code", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion" };
             ma_code.Condition = "ma_statuscode='STARTED' order by ma_updatedate desc";
             ma_code.DbChange += Ms_makecode_DbChange;
-
             Lock.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(Lock);
+            code.Focus();
+            dh = new DataHelper();
         }
 
         private void Ms_makecode_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -226,13 +226,13 @@ namespace UAS_MES.Make
         {
             BaseUtil.ClosePrint(lbl);
             StopWeight.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;
                 serialPort1.Close();
                 SystemInf.OpenPort.Remove(serialPort1.PortName);
                 thread.Interrupt();
-                thread.Join();
             }
             //thread.Abort();
         }
@@ -272,9 +272,13 @@ namespace UAS_MES.Make
 
         private void StopWeight_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void pr_code_TextChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -56,14 +56,14 @@ namespace UAS_MES.Make
 
         private void Make_CustomLablePrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            pr_code.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入产品代码\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            pr_code.Focus();
+            dh = new DataHelper();
         }
         private void InPrint()
         {

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -54,11 +54,11 @@ namespace UAS_MES.Make
         private void Make_Decompose_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             sn_code.Focus();
             OperateResult.AppendText(">>请输入序列号\n");
             count = 0;
             deccount.Text = count + "";
+            dh = new DataHelper();
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -64,12 +64,9 @@ namespace UAS_MES.Make
 
         private void Make_FeedingCollection_Load(object sender, EventArgs e)
         {
-            code.Focus();
             asc.controllInitializeSize(this);
-
             LockMakeCode.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(LockMakeCode);
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本,ma_softversion # 软件版本,ma_ecncode # ECN号";
@@ -78,6 +75,7 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion", "ma_softversion", "ma_ecncode" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DBChange;
+            code.Focus();
             dh = new DataHelper();
         }
 

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -44,14 +44,14 @@ namespace UAS_MES.Make
 
         private void Make_FuselageLabelPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            sncode.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入SN\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            sncode.Focus();
+            dh = new DataHelper();
         }
 
         private void InPrint()

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -65,8 +65,6 @@ namespace UAS_MES.Make
 
             ma_code.SetLockCheckBox(LockCheckBox);
             LockCheckBox.GetMakeCodeCtl(ma_code);
-            dh = new DataHelper();
-
             OperateResult.AppendText(">>请输入返工工单号\n", Color.Black);
 
             asc.controllInitializeSize(this);
@@ -75,6 +73,7 @@ namespace UAS_MES.Make
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
             sn_code.Focus();
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -35,9 +35,9 @@ namespace UAS_MES.Make
         private void Make_MakeCancelDown_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             md_code_rb.Focus();
             ChooseAll.ChooseAll(LabelDataGridView);
+            dh = new DataHelper();
         }
 
         private void Make_MakeCancelDown_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -430,7 +430,6 @@ namespace UAS_MES.Make
                 thread.Interrupt();
             }
             //thread.Abort();
-            dh.Dispose();
         }
 
         private void Packing_Click(object sender, EventArgs e)
@@ -446,7 +445,7 @@ namespace UAS_MES.Make
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "封箱成功", pa_outboxcode.Text, "");
                     OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "封箱成功\n", Color.Green);
-                    if (PR_CHECKCARTONW != "0")
+                    if (PR_CHECKCARTONW != "0"&& pa_standardqty.Text == pa_currentqty.Text)
                     {
                         float weigh = float.Parse(weight.Text.Replace("kg", "").Trim());
                         if (!(weigh > MinWeight && weigh < MaxWeight))

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -55,15 +55,15 @@ namespace UAS_MES.Make
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
             //栈板号输入框聚焦
-            palletcode.Focus();
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             BaudRate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
-            dh = new DataHelper();
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
             startWeigh.PerformClick();
+            dh = new DataHelper();
+            palletcode.Focus();
         }
 
         protected override void OnVisibleChanged(EventArgs e)
@@ -227,9 +227,13 @@ namespace UAS_MES.Make
         //停止称重
         private void stopWeigh_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
         private void getSerialData()
         {
@@ -262,6 +266,8 @@ namespace UAS_MES.Make
         private void Make_PalletWeigh_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
+            stopWeigh.PerformClick();
+            InitPrint.Abort();
             if (serialPort1.IsOpen)
             {
                 GetData = false;

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -57,14 +57,14 @@ namespace UAS_MES.Make
 
         private void Make_RePrintLabel_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            inputText.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入SN\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            inputText.Focus();
+            dh = new DataHelper();
         }
 
         private void InPrint()

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -72,10 +72,10 @@ namespace UAS_MES.Make
         private void Make_SeqProgramTransform_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             code.Focus();
             //提示用户“>>请输入TSN号”
             OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
+            dh = new DataHelper();
         }
 
         private void 序列烧录转换_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -339,7 +339,6 @@ namespace UAS_MES.Make
                 thread.Interrupt();
             }
             //thread.Abort();
-            dh.Dispose();
         }
 
         private void Packing_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -53,7 +53,6 @@ namespace UAS_MES.Make
 
         private void TestCollection_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
             GoodProduct.Checked = true;
             asc.controllInitializeSize(this);
             ms_sncode.Focus();
@@ -68,6 +67,7 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_softversion" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

UAS-MES/FunctionCode/Packing/Packing_CartonSplit.cs

@@ -39,10 +39,11 @@ namespace UAS_MES.Packing
 
         private void Packing_CartonSplit_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
+
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入箱号\n", Color.Black);
             pa_outboxcode.Focus();
+            dh = new DataHelper();
         }
 
         private void pa_outboxcode_KeyDown(object sender, KeyEventArgs e)
@@ -116,7 +117,7 @@ namespace UAS_MES.Packing
                     //更新序列号
                     dh.ExecuteSql("update makeserial set ms_outboxcode='' , ms_nextstepcode=ms_stepcode where ms_id='" + ms_id + "'", "update");
                     //更新箱内当前数量
-                    dh.ExecuteSql("update package set pa_currentqty=pa_currentqty-1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+                    dh.ExecuteSql("update package set pa_currentqty=pa_currentqty-1,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                     //记录拆箱操作日志
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, packtype.Text, User.UserLineCode, User.UserSourceCode, "卡通箱拆箱", "卡通箱拆箱成功,序列号:" + sncode.Text + ",箱号:" + pa_outboxcode.Text, sncode.Text, "");
                     //提示拆箱成功

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -182,7 +182,7 @@ namespace UAS_MES.Packing
                                                     sql.Append("values (packagedetail_seq.nextval,'" + pa_id + "','" + pa_outboxcode.Text + "','" + sn_code.Text + "','1','" + msprodcode + "','" + ms_makecode + "',sysdate,to_char(sysdate,'yyyymmdd'))");
                                                     dh.ExecuteSql(sql.GetString(), "insert");
                                                     //更新原箱数量
-                                                    dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1", "pa_outboxcode = '" + ms_outboxcode + "'");
+                                                    dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1,pa_status=0", "pa_outboxcode = '" + ms_outboxcode + "'");
                                                     //更新目标箱数量
                                                     dh.UpdateByCondition("package", "pa_currentqty=1, pa_totalqty=1,pa_packageqty=1", "pa_outboxcode = '" + pa_outboxcode.Text + "'");
                                                     dh.UpdateByCondition("makeserial", "ms_outboxcode = '" + pa_outboxcode.Text + "'", "ms_id = '" + ms_id + "'");
@@ -281,7 +281,7 @@ namespace UAS_MES.Packing
                                         sql.Append("values (packagedetail_seq.nextval,'" + dh.getFieldDataByCondition("package", "pa_id", "PA_OUTBOXCODE = '" + pa_outboxcode.Text + "'").ToString() + "','" + pa_outboxcode.Text + "','" + sn_code.Text + "','1','" + msprodcode + "','" + ms_makecode + "',sysdate,to_char(sysdate,'yyyymmdd'))");
                                         dh.ExecuteSql(sql.GetString(), "insert");
                                         //更新原箱数量
-                                        dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1", "pa_outboxcode = '" + ms_outboxcode + "'");
+                                        dh.UpdateByCondition("package", "pa_currentqty=pa_currentqty-1,pa_status=0", "pa_outboxcode = '" + ms_outboxcode + "'");
                                         //更新目标箱数量
                                         dh.UpdateByCondition("package", "pa_currentqty=nvl(pa_currentqty,0)+ 1,pa_totalqty=nvl(pa_totalqty,0)+1,pa_packageqty=nvl(pa_packageqty ,0)+1", "pa_outboxcode = '" + pa_outboxcode.Text + "'");
                                         dh.UpdateByCondition("makeserial", "ms_outboxcode = '" + pa_outboxcode.Text + "'", "ms_id = '" + ms_id + "'");
@@ -444,7 +444,7 @@ namespace UAS_MES.Packing
 
                             dh.UpdateByCondition("packagedetail", "PD_OUTBOXCODE = '" + pa_outboxcode.Text + "',PD_PAID = '" + pa_id + "'", "pd_paid='" + old_pa_id + "'");
                             //更新原箱数量
-                            dh.UpdateByCondition("package", "pa_currentqty=0", "pa_outboxcode = '" + ms_outboxcode.Text + "'");
+                            dh.UpdateByCondition("package", "pa_currentqty=0,pa_status=0", "pa_outboxcode = '" + ms_outboxcode.Text + "'");
                             //更新目标箱数量
                             dh.UpdateByCondition("package", "pa_currentqty=" + int.Parse(pa_qty.Text) + ", pa_totalqty=" + int.Parse(pa_qty.Text) + ",pa_packageqty=" + int.Parse(pa_qty.Text) + "", "pa_outboxcode = '" + pa_outboxcode.Text + "'");
                             dh.UpdateByCondition("makeserial", "ms_outboxcode = '" + pa_outboxcode.Text + "'", "ms_outboxcode = '" + ms_outboxcode.Text + "'");

UAS-MES/FunctionCode/Packing/Packing_ProdWeightSet.cs

@@ -157,9 +157,13 @@ namespace UAS_MES.Packing
         //停止称重
         private void stopWeigh_Click(object sender, EventArgs e)
         {
-            GetData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
 
         private void confirm_Click(object sender, EventArgs e)
@@ -290,6 +294,7 @@ namespace UAS_MES.Packing
                 SystemInf.OpenPort.Remove(serialPort1.PortName);
                 thread.Interrupt();
             }
+            //thread.Abort();
         }
 
         private void standardWeight_Leave(object sender, EventArgs e)

UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.cs

@@ -93,17 +93,25 @@ namespace UAS_MES.SystemSetting
 
         private void SystemSetting_ScaleTest_FormClosing(object sender, FormClosingEventArgs e)
         {
-            StopTest.PerformClick();
-            try { ReadData = false; }
-            catch (Exception) { }
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Interrupt();
+            }
             //thread.Abort();
         }
 
         private void StopTest_Click(object sender, EventArgs e)
         {
-            ReadData = false;
-            SystemInf.OpenPort.Remove(serialPort1.PortName);
-            serialPort1.Close();
+            if (serialPort1.IsOpen)
+            {
+                ReadData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
         }
     }
 }

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -51,13 +51,12 @@ namespace UAS_MES.Warehouse
             pi_inoutno.FormName = Name;
             pi_inoutno.Condition = "pi_pdastatus<>'已出库' and pi_class='出货单'";
             pi_inoutno.DbChange += Pi_inoutno_DbChange;
-
-            dh = new DataHelper();
-
             asc.controllInitializeSize(this);
+            dh = new DataHelper();
             needMakeIn = dh.GetConfig("needMakeIn", "MESSetting").ToString();
             input.Focus();
             OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
+         
 
         }
 

UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -442,11 +442,10 @@ namespace UAS_MES.Warehouse
 
         private void Warehouse_ProductMakeIn_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-
             asc.controllInitializeSize(this);
             getcount = 0;
             getqty.Text = getcount.ToString();
+            dh = new DataHelper();
             sql.Clear();
             sql.Append("select pim_id,pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
             sql.Append("left join product on pr_code=pim_prodcode where pr_detail is null");

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1348,7 +1348,7 @@ namespace UAS_MES.PublicMethod
                     }
                     break;
                 case "PROD":
-                    string prodcode = dh.getFieldDataByCondition("mes_package_view", "v_prodcode", "v_outboxcode='" + pa_outboxcode + "'").ToString();
+                    string prodcode = dh.getFieldDataByCondition("package", "pa_prodcode", "pa_outboxcode='" + pa_outboxcode + "'").ToString();
                     if (prodcode != pa_prodcode)
                     {
                         error = ">>当前箱" + outboxcode + "对应物料" + pa_prodcode + "和待装箱号" + pa_outboxcode + "物料" + prodcode + "不相等";