价格批量调整bug修改

code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/wnq01/wnq/scm/plugin/form/BatchPriceAdjBaseEditPlugin.java

@@ -210,7 +210,8 @@ public class BatchPriceAdjBaseEditPlugin extends AbstractBillPlugIn implements P
     }
 
     private void allAddentry(String materialType) {
-        DynamicObject[] materialArr = BusinessDataServiceHelper.load("bd_material", "id,masterid,name,nckd_decimalfield,nckd_decimalfield1", new QFilter[]{new QFilter("name", QCP.like, "%" + materialType + "%")});
+
+        DynamicObject[] materialArr = BusinessDataServiceHelper.load("bd_material", "id,masterid,name,nckd_decimalfield,nckd_decimalfield1", new QFilter[]{new QFilter("name", QCP.like, "%" + materialType + "%").and("enable",QCP.equals,"1")});
         if (materialArr.length > 0) {
             EntryGrid nckdPutentry = this.getView().getControl("nckd_putentry");
             int[] selectRows = nckdPutentry.getSelectRows();

code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/wnq01/wnq/scm/plugin/form/BatchPriceAdjMobEditPlugin.java

@@ -82,7 +82,7 @@ public class BatchPriceAdjMobEditPlugin extends AbstractMobBillPlugIn implements
     }
 
     private void chooosePutEntryRow() {
-        AbstractGrid grid = this.getView().getControl(ENTRYENTITY);
+        AbstractGrid grid = this.getView().getControl(NCKD_PUTENTRY);
         int index = grid.getEntryState().getFocusRow();
         MobileBillShowParameter showParameter = new MobileBillShowParameter();
         showParameter.setFormId(this.getPutEntryEditForm());

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

@@ -41,7 +41,7 @@ public class BatchPriceAdjOpPlugin extends AbstractOperationServicePlugIn implem
         super.beginOperationTransaction(e);
         String operationKey = e.getOperationKey();
         if (StringUtils.equals("submit",operationKey) || StringUtils.equals("save",operationKey)){
-             DynamicObject[] materialArr = BusinessDataServiceHelper.load("bd_material", "id,masterid,name,nckd_decimalfield,nckd_decimalfield1", new QFilter[]{new QFilter("name", QCP.like, "%袋装%").or(new QFilter("name", QCP.like, "%散装%"))});
+             DynamicObject[] materialArr = BusinessDataServiceHelper.load("bd_material", "id,masterid,name,nckd_decimalfield,nckd_decimalfield1", new QFilter[]{new QFilter("enable",QCP.equals,"1"),new QFilter("name", QCP.like, "%袋装%").or(new QFilter("name", QCP.like, "%散装%"))});
             List<DynamicObject> dai = Arrays.stream(materialArr).filter(x -> x.getString("name").contains("袋装")).collect(Collectors.toList());
             List<DynamicObject> san= Arrays.stream(materialArr).filter(x -> x.getString("name").contains("散装")).collect(Collectors.toList());
             for (DynamicObject bill : e.getDataEntities()) {