出货单采集总箱数查询修改

UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -77,14 +77,20 @@ namespace UAS_MES.Warehouse
                 BaseUtil.SetFormValue(this.Controls, dtpi);
             }
             sql.Clear();
-            sql.Append("select nvl((select sum(pd_outqty) from prodiodetail where pd_piid="+pi_id.Text+"),0)outqty,nvl((select count(1)cn from prodiomac where pim_inoutno=pd_inoutno),0) getqty , ");
-            sql.Append("nvl((select sum(CASE WHEN pim_type='BOX' then 1 else nvl((select pa_packageqty from package where pa_outboxcode=pim_outboxcode),0)end) from prodiomac ");
-            sql.Append("where pim_inoutno='" + pi_inoutno.Text + "' and NVL(PIM_OUTBOXCODE,' ')<>' ' AND  pim_type in('BOX','PALLET')),0) boxqty from  prodiodetail where pd_piid='" + pi_id.Text + "' ");
+            sql.Append("select nvl((select sum(pd_outqty) from prodiodetail where pd_piid="+pi_id.Text+"),0)outqty,nvl((select count(1)cn from prodiomac where pim_inoutno=pd_inoutno),0) getqty  ");
+            sql.Append(" from  prodiodetail where pd_piid='" + pi_id.Text + "' ");
             dtform = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dtform.Rows.Count > 0)
             {
+                int boxqtycount = 0;
                 BaseUtil.SetFormValue(this.Controls, dtform);
                 ungetqty.Text = (int.Parse(dtform.Rows[0]["outqty"].ToString()) - int.Parse(dtform.Rows[0]["getqty"].ToString())).ToString();
+                sql.Clear();
+                sql.Append("select pim_type,pim_outboxcode from prodiomac where pim_inoutno='"+pi_inoutno.Text+ "' and NVL(PIM_OUTBOXCODE,' ')<>' ' AND pim_type ='BOX' GROUP BY pim_outboxcode,pim_type");
+                DataTable dtout = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
+                boxqtycount += dtout.Rows.Count;
+                boxqtycount += int.Parse(dh.getFieldDataByCondition("package", "nvl(sum(pa_packageqty),0)", " pa_outboxcode in (select pim_outboxcode from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and NVL(PIM_OUTBOXCODE,' ')<>' ' AND  pim_type ='PALLET' GROUP BY pim_outboxcode)").ToString());
+                boxqty.Text = boxqtycount.ToString();
             }
             if (pi_type.Text == "按订单出货")
             {
@@ -174,6 +180,7 @@ namespace UAS_MES.Warehouse
                         dh.ExecuteSQLTran(ExeSQL.ToArray());   
                         OperateResult.AppendText("出货单" + pi_inoutno.Text + "出库成功\n", Color.Black,pi_inoutno);
                         BaseUtil.CleanDataGridView(InOutDetailDGV);
+                        BaseUtil.CleanControls(panel1.Controls);
                     }
                 }
                 else