Browse Source

出入库录入箱与栈板的校验调整

Hcsy 8 years ago
parent
commit
11b3b0d1da
1 changed files with 9 additions and 4 deletions
  1. 9 4
      UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

+ 9 - 4
UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -616,11 +616,16 @@ namespace UAS_MES.Warehouse
                 sql.Clear();
                 sql.Append("select ms_prodcode,ms_salecode,cn  from (select ms_prodcode,ms_salecode,count(1)cn from mes_package_view left join makeserial on ms_sncode=v_barcode and ms_makecode=v_makecode  where v_outboxcode='" + input.Text + "' ");
                 sql.Append(" group by ms_prodcode,ms_salecode) left join (select pd_ordercode,pd_prodcode,outqty-nvl((select count(1) from prodiomac where pim_inoutno='" + pi_inoutno.Text + "' and pim_prodcode=pd_prodcode),0)ungetqty");
-                sql.Append("  from (select pd_ordercode,pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode,pd_ordercode)) on ms_prodcode=pd_prodcode and ms_salecode=pd_ordercode where nvl(pd_prodcode,' ')<>' ' or nvl(pd_ordercode,' ')<>' ' or cn>nvl(ungetqty,0)");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                if ((int.Parse(dt.Rows[0]["cn"].ToString()) > 0))
+                sql.Append("  from (select pd_ordercode,pd_prodcode,sum(pd_outqty)outqty from prodiodetail where pd_piid=" + pi_id.Text + " group by pd_prodcode,pd_ordercode)) on ms_prodcode=pd_prodcode where nvl(pd_prodcode,' ')<>' ' and ms_salecode<>pd_ordercode or(ms_salecode=pd_ordercode and cn>nvl(ungetqty,0))");
+                DataTable dtAA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dtAA.Rows.Count>0)
                 {
-                    OperateResult.AppendText(type + input.Text + "内的序列号中的物料+订单不在出货单中或者栈板内中序列号的数量大于剩余出货数,栈板内物料号:" + dt.Rows[0]["ms_prodcode"].ToString() + ",订单号:" + dt.Rows[0]["ms_salecode"].ToString() + ",数量:" + dt.Rows[0]["cn"].ToString() + "\n", Color.Red, input);
+                    string badmessgae = "";
+                    for (int i = 0; i < dtAA.Rows.Count; i++)
+                    {
+                        badmessgae += "物料号:" + dtAA.Rows[i]["ms_prodcode"].ToString() + ",订单号:" + dtAA.Rows[i]["ms_salecode"].ToString() + ",数量:" + dtAA.Rows[i]["cn"].ToString() + "\n";
+                    }
+                    OperateResult.AppendText(type + input.Text + "内的序列号中的物料+订单不在出货单中或者所装的序列号的数量大于剩余出货数,"+badmessgae, Color.Red, input);
                     return false;
                 }
                 else