111

code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/poc602/plugin/operate/PurContractSubmitOperationServicePlugIn.java

@@ -53,7 +53,7 @@ public class PurContractSubmitOperationServicePlugIn extends AbstractOperationSe
 					BigDecimal nckd_ycjeNew = purjshj.add(nckd_ycje);
 					if(nckd_ycjeNew.compareTo(salejshj) > 0) {
 						existError = true;
-						String error = "当前合同累计已下采购订单金额" + nckd_ycje.setScale(2) + ",当前采购金额已超" + (nckd_ycjeNew.subtract(salejshj)).setScale(2) + "不允许采购";
+						String error = "当前关联的销售合同金额为" + salejshj.setScale(2) + ",已关联生成采购合同金额" + nckd_ycje.setScale(2) + "已超销售合同金额，不允许采购！";
 						e.setCancel(true);
 						e.setCancelMessage(error);
 						break;

code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/poc602/plugin/task/PurContractHaveNotJGSDTask.java

@@ -50,11 +50,10 @@ public class PurContractHaveNotJGSDTask extends AbstractTask {
             QFilter qcght = new QFilter("billstatus", QCP.equals, "C");
             qcght.and("nckd_refbillfield.billno", QCP.in, xshtbillnos);
             List<String> cghtbillnos = new ArrayList<>();
-            DynamicObjectCollection cghts = QueryServiceHelper.query("conm_purcontract","id,billno,nckd_refbillfield", qcght.toArray(), "");
+            DynamicObjectCollection cghts = QueryServiceHelper.query("conm_purcontract","id,billno,nckd_refbillfield.billno", qcght.toArray(), "");
             for(DynamicObject cght : cghts) {
             	String billno = cght.getString("billno");
-            	DynamicObject xshtbill = cght.getDynamicObject("nckd_refbillfield");
-            	String xshtbillno = xshtbill.getString("billno");
+            	String xshtbillno = cght.getString("nckd_refbillfield.billno");
             	xsht2cghtbillno.put(xshtbillno, billno);
             	cghtbillnos.add(billno);
             }
@@ -63,7 +62,7 @@ public class PurContractHaveNotJGSDTask extends AbstractTask {
             	QFilter qcghtbg = new QFilter("billstatus", QCP.equals, "C");
             	qcghtbg.and("billno", QCP.in, cghtbillnos);
             	qcghtbg.and("nckd_combofield",QCP.equals,"A");
-                DynamicObjectCollection cghtbgs = QueryServiceHelper.query("conm_xpurcontract","id,billno,nckd_refbillfield", qcghtbg.toArray(), "");
+                DynamicObjectCollection cghtbgs = QueryServiceHelper.query("conm_xpurcontract","id,billno", qcghtbg.toArray(), "");
                 if(!cghtbgs.isEmpty()){
                     for (DynamicObject cghtbg : cghtbgs) {
                         String billno = cghtbg.getString("billno");//采购合同编号