fix:
1.发运明细过滤处理
This commit is contained in:
parent
062a58eb37
commit
e63328acdc
@ -534,8 +534,16 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
|
|||||||
if ("yem_es_salesorder".equals(yemsourcebilltype)) {
|
if ("yem_es_salesorder".equals(yemsourcebilltype)) {
|
||||||
DynamicObjectCollection dynamicObjectCollection = this.getModel().getEntryEntity("yem_es_materialinfo");
|
DynamicObjectCollection dynamicObjectCollection = this.getModel().getEntryEntity("yem_es_materialinfo");
|
||||||
if (!dynamicObjectCollection.isEmpty()) {
|
if (!dynamicObjectCollection.isEmpty()) {
|
||||||
|
List<String> list = new ArrayList<>();
|
||||||
DynamicObject yemEsMaterialinfo = dynamicObjectCollection.get(currentRowIndex);
|
DynamicObject yemEsMaterialinfo = dynamicObjectCollection.get(currentRowIndex);
|
||||||
long yemCoreentryid = yemEsMaterialinfo.getLong("yem_coreentryid");
|
long yemCoreentryid = yemEsMaterialinfo.getLong("yem_coreentryid");
|
||||||
|
DynamicObjectCollection yemEsSalesorderZ = yemEsMaterialinfo.getDynamicObjectCollection("yem_es_salesorder_z");
|
||||||
|
if (!yemEsSalesorderZ.isEmpty()){
|
||||||
|
for (DynamicObject dynamicObject : yemEsSalesorderZ) {
|
||||||
|
String yemVehicleno = dynamicObject.getString("yem_vehicleno");
|
||||||
|
list.add(yemVehicleno);
|
||||||
|
}
|
||||||
|
}
|
||||||
String yemsourcebillno = (String) this.getModel().getValue("yem_sourcebillno");
|
String yemsourcebillno = (String) this.getModel().getValue("yem_sourcebillno");
|
||||||
if (YEM.isNotEmpty(yemsourcebillno)) {
|
if (YEM.isNotEmpty(yemsourcebillno)) {
|
||||||
DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "", new QFilter[]{
|
DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "", new QFilter[]{
|
||||||
@ -553,7 +561,8 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
|
|||||||
List<DynamicObject> zjNumberList = new ArrayList();
|
List<DynamicObject> zjNumberList = new ArrayList();
|
||||||
for (DynamicObject temp : yem_es_salesorder_z) {
|
for (DynamicObject temp : yem_es_salesorder_z) {
|
||||||
boolean yemIfdelivered = temp.getBoolean("yem_ifdelivered");
|
boolean yemIfdelivered = temp.getBoolean("yem_ifdelivered");
|
||||||
if (!yemIfdelivered) {
|
String yem_vehicleno = temp.getString("yem_vehicleno");
|
||||||
|
if (!yemIfdelivered && !list.contains(yem_vehicleno)) {
|
||||||
zjNumberList.add(temp);
|
zjNumberList.add(temp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user