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

fix:

Browse Source 
1.发运明细过滤处理

(cherry picked from commit 062a58eb37)
This commit is contained in:
ljw 2024-12-12 18:36:45 +08:00
parent 570002b229
commit a184cb5203
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
View File

@ -492,7 +492,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
Map<Long, BigDecimal> map = new HashMap<>(); Map<Long, BigDecimal> map = new HashMap<>();
for (int rowIndex : rowIndexs) { for (int rowIndex : rowIndexs) {
DynamicObject yemProductmodel = (DynamicObject) this.getModel().getValue("yem_productmodel", rowIndex); DynamicObject yemProductmodel = (DynamicObject) this.getModel().getValue("yem_productmodel", rowIndex);
BigDecimal yemQty = (BigDecimal) this.getModel().getValue("yem_qty",rowIndex); BigDecimal yemQty = (BigDecimal) this.getModel().getValue("yem_qty", rowIndex);
if (yemProductmodel != null) { if (yemProductmodel != null) {
long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id"); long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id");
map.merge(aLong, yemQty, (a, b) -> b.add(a)); map.merge(aLong, yemQty, (a, b) -> b.add(a));
@ -532,6 +532,10 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
int currentRowIndex = this.getModel().getEntryCurrentRowIndex("yem_es_materialinfo"); int currentRowIndex = this.getModel().getEntryCurrentRowIndex("yem_es_materialinfo");
String yemsourcebilltype = (String) this.getModel().getValue("yem_sourcebilltype"); String yemsourcebilltype = (String) this.getModel().getValue("yem_sourcebilltype");
if ("yem_es_salesorder".equals(yemsourcebilltype)) { if ("yem_es_salesorder".equals(yemsourcebilltype)) {
DynamicObjectCollection dynamicObjectCollection = this.getModel().getEntryEntity("yem_es_materialinfo");
if (!dynamicObjectCollection.isEmpty()) {
DynamicObject yemEsMaterialinfo = dynamicObjectCollection.get(currentRowIndex);
long yemCoreentryid = yemEsMaterialinfo.getLong("yem_coreentryid");
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[]{
@ -540,11 +544,11 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
}); });
if (dynamicObject != null) { if (dynamicObject != null) {
dynamicObject = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), dynamicObject.getDynamicObjectType().getName()); dynamicObject = BusinessDataServiceHelper.loadSingle(dynamicObject.getPkValue(), dynamicObject.getDynamicObjectType().getName());
DynamicObjectCollection dynamicObjectCollection = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection dynamicObject1 = dynamicObject.getDynamicObjectCollection("yem_es_materialinfo");
if (dynamicObjectCollection != null && dynamicObjectCollection.size() > 0) { for (DynamicObject object : dynamicObject1) {
DynamicObject dynamicObject1 = dynamicObjectCollection.get(currentRowIndex); long aLong = object.getLong("id");
if (dynamicObject1 != null) { if (yemCoreentryid == aLong) {
DynamicObjectCollection yem_es_salesorder_z = dynamicObject1.getDynamicObjectCollection("yem_es_salesorder_z"); DynamicObjectCollection yem_es_salesorder_z = object.getDynamicObjectCollection("yem_es_salesorder_z");
Map<String, Object> datas = new HashMap(); Map<String, Object> datas = new HashMap();
List<DynamicObject> zjNumberList = new ArrayList(); List<DynamicObject> zjNumberList = new ArrayList();
for (DynamicObject temp : yem_es_salesorder_z) { for (DynamicObject temp : yem_es_salesorder_z) {
@ -558,6 +562,7 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
} }
} }
} }
}
} }

3
src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
View File

@ -129,6 +129,9 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
//单据编号 //单据编号
json.put("number", dataEntitie.getString("billno")); json.put("number", dataEntitie.getString("billno"));
//送货客户 //送货客户
if (dataEntitie.getString("yem_sale_type").equals("B")) {
}
DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1"); DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1");
if (yemCustomer != null) { if (yemCustomer != null) {
json.put("customer", setJson("number", yemCustomer.getString("number"))); json.put("customer", setJson("number", yemCustomer.getString("number")));