Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -111,6 +111,7 @@ namespace UAS_MES.Make
             else
             {
                 MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在或者未审核");
+                return;
             }
             //限制钢网使用的产品
             dt = (DataTable)dh.ExecuteSql("select 1 from STENILCANUSEPRO where sp_stcode='" + SU_DEVCODE.Text + "' and sp_prodcode='" + ma_prodcode.Text + "'", "select");

UAS-MES/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -142,6 +142,7 @@ namespace UAS_MES.Make
                     else
                     {
                         MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                        return;
                     }
                     string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
                     //如果有使用过的话

UAS-出货标签管理(贸易版)/生成条码.cs

@@ -410,6 +410,8 @@ namespace UAS_LabelMachine
                     restqty1 += qty;
                 }
             }
+            ProdIoInfDGV.Rows[e.RowIndex].Cells["pd_qty"].Value = decimal.Parse(pd_totalqty.ToString()) - restqty1;
+            pd_qty = ProdIoInfDGV.Rows[e.RowIndex].Cells["pd_qty"].Value;
             if (pr_zxbzs != null && pd_qty != null && mid_qty != null)
             {
                 decimal 最小包装量 = decimal.Parse(pr_zxbzs.ToString());
@@ -495,7 +497,7 @@ namespace UAS_LabelMachine
                         sql.Append("pd_prodcode,pd_piclass,outqty-nvl((select sum(nvl(pib_qty,0)) from PRODIOBARCODE where PIB_PIID=pd_piid and pib_pdno=pd_pdno ),0)pd_qty ");
                         sql.Append("from (select pd_piid,min(pd_id) pd_id,sum(pd_outqty)outqty,pd_ordercode,pd_orderdetno,pd_pdno,max(pd_prodcode)pd_prodcode,max(pd_piclass)pd_piclass ");
                         sql.Append("from prodiodetail  group by pd_piid,pd_ordercode, pd_orderdetno,pd_pdno)T left join product ");
-                        sql.Append("on pr_code=pd_prodcode where nvl(pr_zxbzs,0)>0)  where  pd_piid='" + pi_id + "'");
+                        sql.Append("on pr_code=pd_prodcode)  where  pd_piid='" + pi_id + "'");
                         break;
                     case "完工入库单":
                         sql.Clear();