violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
zhouc 2024-11-04 14:58:28 +08:00
commit 2c5b8105aa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java
View File

@ -435,6 +435,14 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
case "yem_accessorytype": case "yem_accessorytype":
carryingDetailedAssociatedQuantity(rowIndex, model); carryingDetailedAssociatedQuantity(rowIndex, model);
break; 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": case"yem_shipportsename":
extracted(model,rowIndex); extracted(model,rowIndex);
break; break;
@ -653,7 +661,6 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before
} }
} }
} }
public static DynamicObject[] getDeclarationElementsUseCarry(IDataModel model, int rowIndex, String currentFilterKey) { public static DynamicObject[] getDeclarationElementsUseCarry(IDataModel model, int rowIndex, String currentFilterKey) {
// 业务分类 Z | P // 业务分类 Z | P
String businesssort = (String) model.getValue("yem_businesssort", rowIndex); 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()); return BusinessDataServiceHelper.load("yem_bd_declarationele", selectfields, qFilter.toArray());
} }
private static Set<Long> getCompAndPartProduct(String number) { private static Set<Long> getCompAndPartProduct(String number) {
String[] type = {number, number + "PJ"}; String[] type = {number, number + "PJ"};
DynamicObject[] load = BusinessDataServiceHelper.load("yem_bd_productsgroup", "billno, id", new QFilter[]{new QFilter("number", "in", type)}); 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); model.setValue("yem_frontrateentry", decimal, rowIndex);
} }
yemShipports(rowIndex); yemShipports(rowIndex);
extracted(model,rowIndex);
} }
} }
} }