【品网】【上线需求】【采购验退单 不需要补料时不考虑已转数】

src/com/uas/erp/dao/common/impl/ProdInOutDaoImpl.java

@@ -1450,7 +1450,7 @@ public class ProdInOutDaoImpl extends BaseDao implements ProdInOutDao {
 			if ("采购验退单".equals(piclass)) {
 				qty = getFieldDataByCondition("ProdIODetail left join ProdInOut on pi_id=pd_piid", "sum(pd_outqty)", "pd_ordercode='"
 						+ ordercode + "' AND pd_orderdetno=" + orderdetno + " and pd_id <>" + id
-						+ " and pd_piclass='采购验退单' and pi_statuscode<>'POSTED'");
+						+ " and pd_piclass='采购验退单' and pi_statuscode<>'POSTED' and nvl(PD_NONEEDBL,0)=0");
 				qty = qty == null ? 0 : qty;
 				aq = getFieldsDataByCondition("PurchaseDetail", new String[] { "pd_acceptqty", "pd_code", "pd_detno" }, "pd_code='"
 						+ ordercode + "' and pd_detno=" + orderdetno);
@@ -2415,7 +2415,7 @@ public class ProdInOutDaoImpl extends BaseDao implements ProdInOutDao {
 		Object y = getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_inqty,0))", "pd_ordercode='" + pdcode + "' and pd_orderdetno="
 				+ pddetno + " and nvl(pd_qcid,0)=0 and nvl(pd_anid,0)=0 and pd_piclass in ('采购验收单')");
 		Object r = getFieldDataByCondition("ProdIODetail left join ProdInOut on pd_piid=pi_id", "sum(nvl(pd_outqty,0))",
-				"pd_piclass='采购验退单' and nvl(pd_status,0)>0 and pd_ordercode='" + pdcode + "' and pd_orderdetno=" + pddetno);
+				"pd_piclass='采购验退单' and nvl(pd_status,0)>0 and nvl(PD_NONEEDBL,0)=0 and pd_ordercode='" + pdcode + "' and pd_orderdetno=" + pddetno);
 		y = y == null ? 0 : y;
 		r = r == null ? 0 : r;
 		if (id != null) {

src/com/uas/erp/dao/common/impl/PurchaseDaoImpl.java

@@ -620,7 +620,7 @@ public class PurchaseDaoImpl extends BaseDao implements PurchaseDao {
 						+ pus[1]);
 				y = y == null ? 0 : y;
 				r = getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
-						+ pus[1] + " AND pd_piclass='采购验退单'");
+						+ pus[1] + " AND pd_piclass='采购验退单' and nvl(PD_NONEEDBL,0)=0");
 				o = getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
 						+ pus[1] + " AND pd_piclass='不良品出库单'");
 				r = r == null ? 0 : r;
@@ -1019,7 +1019,7 @@ public class PurchaseDaoImpl extends BaseDao implements PurchaseDao {
 						+ "' and pd_orderdetno=" + pus[1]);
 				y = y == null ? 0 : y;
 				r = getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
-						+ pus[1] + " AND pd_piclass='采购验退单' and pd_status>0");
+						+ pus[1] + " AND pd_piclass='采购验退单' and pd_status>0 and nvl(PD_NONEEDBL,0)=0");
 				o = getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
 						+ pus[1] + " AND pd_piclass='不良品出库单' and pd_status>0");
 				r = r == null ? 0 : r;

src/com/uas/erp/dao/common/impl/VerifyApplyDaoImpl.java

@@ -785,7 +785,7 @@ public class VerifyApplyDaoImpl extends BaseDao implements VerifyApplyDao {
 		Object y = getFieldDataByCondition("VerifyApplyDetail", "sum(nvl(vad_qty,0))", "vad_pucode='" + vad_pucode + "' and vad_pudetno="
 				+ vad_pudetno + " and vad_id<>" + vadid);
 		Object r = getFieldDataByCondition("ProdIODetail left join ProdInOut on pd_piid=pi_id", "sum(nvl(pd_outqty,0))",
-				"pd_piclass In ('采购验退单','不良品出库单') and pi_statuscode='POSTED' and pd_ordercode='" + vad_pucode + "' and pd_orderdetno="
+				"pd_piclass In ('采购验退单','不良品出库单') and pi_statuscode='POSTED' and nvl(PD_NONEEDBL,0)=0 and pd_ordercode='" + vad_pucode + "' and pd_orderdetno="
 						+ vad_pudetno);
 		y = y == null ? 0 : y;
 		r = r == null ? 0 : r;

src/com/uas/erp/service/scm/impl/ToProdInOutServiceImpl.java

@@ -411,7 +411,7 @@ public class ToProdInOutServiceImpl implements ToProdInOutService {
 						+ "' and pd_orderdetno=" + pus[1]);
 				y = y == null ? 0 : y;
 				r = baseDao.getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
-						+ pus[1] + " AND pd_piclass='采购验退单' and pd_status>0");
+						+ pus[1] + " AND pd_piclass='采购验退单' and pd_status>0 and nvl(PD_NONEEDBL,0)=0");
 				o = baseDao.getFieldDataByCondition("ProdIODetail", "sum(nvl(pd_outqty,0))", "pd_ordercode='" + pus[0] + "' and pd_orderdetno="
 						+ pus[1] + " AND pd_piclass='不良品出库单' and pd_status>0");
 				r = r == null ? 0 : r;

src/com/uas/erp/service/scm/impl/VerifyApplyChangeServiceImpl.java

@@ -101,7 +101,7 @@ public class VerifyApplyChangeServiceImpl implements VerifyApplyChangeService {
 				qty = baseDao.getFieldValue("VerifyApplyDetail", "nvl(sum(vad_qty),0)", "vad_pucode='" + pucode + "' and vad_pudetno="
 						+ pudetno + " AND vad_id <>" + vads[0], Double.class);
 				returnqty = baseDao.getFieldValue("ProdIODetail", "nvl(sum(pd_outqty),0)", "pd_ordercode='" + pucode
-						+ "' and pd_orderdetno=" + pudetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0", Double.class);
+						+ "' and pd_orderdetno=" + pudetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0 and nvl(PD_NONEEDBL,0)=0", Double.class);
 				aq = baseDao.getFieldValue("PurchaseDetail", "nvl(pd_qty,0)", "pd_code='" + pucode + "' and pd_detno=" + pudetno,
 						Double.class);
 				if (aq + returnqty < qty + tQty) {
@@ -173,7 +173,7 @@ public class VerifyApplyChangeServiceImpl implements VerifyApplyChangeService {
 				qty = baseDao.getFieldValue("VerifyApplyDetail", "nvl(sum(vad_qty),0)", "vad_pucode='" + pucode + "' and vad_pudetno="
 						+ pudetno + " AND vad_id <>" + rs.getObject("vad_id"), Double.class);
 				returnqty = baseDao.getFieldValue("ProdIODetail", "nvl(sum(pd_outqty),0)", "pd_ordercode='" + pucode
-						+ "' and pd_orderdetno=" + pudetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0", Double.class);
+						+ "' and pd_orderdetno=" + pudetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0 and nvl(PD_NONEEDBL,0)=0", Double.class);
 				aqS = baseDao.getFieldValue("PurchaseDetail", "nvl(pd_qty,0)", "pd_code='" + pucode + "' and pd_detno=" + pudetno,
 						String.class);
 				if(aqS==null){

src/com/uas/erp/service/scm/impl/VerifyApplyServiceImpl.java

@@ -226,7 +226,7 @@ public class VerifyApplyServiceImpl implements VerifyApplyService {
 					qty = baseDao.getFieldValue("VerifyApplyDetail", "nvl(sum(vad_qty),0)", "vad_pucode='" + puCode
 							+ "' and vad_pudetno=" + puDetno + " AND vad_id not in (" + vad_ids+")", Double.class);
 					returnqty = baseDao.getFieldValue("ProdIODetail", "nvl(sum(pd_outqty),0)", "pd_ordercode='" + puCode
-									+ "' and pd_orderdetno=" + puDetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0",
+									+ "' and pd_orderdetno=" + puDetno + " AND pd_piclass in ('采购验退单','不良品出库单') and pd_status>0 and nvl(PD_NONEEDBL,0)=0",
 							Double.class);
 					purchaseDao.updatePurcYNotifyQTY(0, "select pd_id from purchasedetail where pd_code='" + puCode
 							+ "' and pd_detno=" + puDetno + "");
@@ -468,7 +468,7 @@ public class VerifyApplyServiceImpl implements VerifyApplyService {
 							"vad_pucode='" + rs.getObject("vad_pucode") + "' and vad_pudetno=" + rs.getObject("vad_pudetno")
 									+ " AND vad_id <>" + vadid);
 					returnqty = baseDao.getFieldDataByCondition("ProdioDetail", "sum(pd_outqty)",
-							"pd_piclass in ('不良品出库单','采购验退单') and pd_status>0 and pd_ordercode='" + rs.getObject("vad_pucode")
+							"pd_piclass in ('不良品出库单','采购验退单') and pd_status>0 and nvl(PD_NONEEDBL,0)=0 and pd_ordercode='" + rs.getObject("vad_pucode")
 									+ "' and pd_orderdetno=" + rs.getObject("vad_pudetno"));
 					aq = baseDao.getFieldDataByCondition("PurchaseDetail", "nvl(pd_qty,0)-nvl(pd_frozenqty,0)",
 							"pd_code='" + rs.getObject("vad_pucode") + "' and pd_detno=" + rs.getObject("vad_pudetno"));
@@ -642,7 +642,7 @@ public class VerifyApplyServiceImpl implements VerifyApplyService {
 							"vad_pucode='" + rs.getObject("vad_pucode") + "' and vad_pudetno=" + rs.getObject("vad_pudetno")
 									+ " AND vad_id <>" + vadid);
 					returnqty = baseDao.getFieldDataByCondition("ProdioDetail", "nvl(sum(pd_outqty),0)",
-							"pd_piclass in ('不良品出库单','采购验退单') and pd_status>0 and pd_ordercode='" + rs.getObject("vad_pucode")
+							"pd_piclass in ('不良品出库单','采购验退单') and pd_status>0 and nvl(PD_NONEEDBL,0)=0 and pd_ordercode='" + rs.getObject("vad_pucode")
 									+ "' and pd_orderdetno=" + rs.getObject("vad_pudetno"));
 					aq = baseDao.getFieldDataByCondition("PurchaseDetail", "nvl(pd_qty,0)-nvl(pd_frozenqty,0)",
 							"pd_code='" + rs.getObject("vad_pucode") + "' and pd_detno=" + rs.getObject("vad_pudetno"));