Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
2c5b8105aa
@ -435,6 +435,14 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
|
||||
case "yem_accessorytype":
|
||||
carryingDetailedAssociatedQuantity(rowIndex, model);
|
||||
break;
|
||||
case"yem_port":
|
||||
Object newValue1 = changeData.getNewValue();
|
||||
if (newValue1!=null){
|
||||
DynamicObject value1 =(DynamicObject) newValue1;
|
||||
String yemNamecn = value1.getString("yem_namecn");
|
||||
this.getModel().setValue("yem_departure",yemNamecn,rowIndex);
|
||||
}
|
||||
break;
|
||||
case"yem_shipportsename":
|
||||
extracted(model,rowIndex);
|
||||
break;
|
||||
@ -653,7 +661,6 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static DynamicObject[] getDeclarationElementsUseCarry(IDataModel model, int rowIndex, String currentFilterKey) {
|
||||
// 业务分类 Z | P
|
||||
String businesssort = (String) model.getValue("yem_businesssort", rowIndex);
|
||||
@ -732,7 +739,6 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
|
||||
|
||||
return BusinessDataServiceHelper.load("yem_bd_declarationele", selectfields, qFilter.toArray());
|
||||
}
|
||||
|
||||
private static Set<Long> getCompAndPartProduct(String number) {
|
||||
String[] type = {number, number + "PJ"};
|
||||
DynamicObject[] load = BusinessDataServiceHelper.load("yem_bd_productsgroup", "billno, id", new QFilter[]{new QFilter("number", "in", type)});
|
||||
@ -832,8 +838,6 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
|
||||
model.setValue("yem_frontrateentry", decimal, rowIndex);
|
||||
}
|
||||
yemShipports(rowIndex);
|
||||
extracted(model,rowIndex);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user