物料编码和采购单号组合去重

1

14 小时以前 722fefac5d86bf9ddc4f2e252292cff0db8343cb

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -767,7 +767,10 @@
                                        orderDetlService.selectByOrderId(order.getId());

                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;
@@ -939,7 +942,10 @@
                                        orderDetlService.selectByOrderId(order.getId());

                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;
@@ -1104,7 +1110,10 @@
                                        orderDetlService.selectByOrderId(order.getId());

                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;
@@ -1271,7 +1280,10 @@


                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;
@@ -1444,7 +1456,10 @@
                                        orderDetlService.selectByOrderId(order.getId());

                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;
@@ -1580,6 +1595,7 @@
                            }
                            for (int k = 0; k < billEntryArray.size(); k++) {
                                JSONObject entry = billEntryArray.getJSONObject(k);
                                String memo = null;
                                String matnr = entry.getString("material_number"); //物料编码，内部SKU
                                Double anfmeBox = entry.getDouble("eap7_integerfield");//箱数
                                Double anfme = entry.getDouble("completqty");//个数
@@ -1587,12 +1603,13 @@
                                Double totalVolume = entry.getDouble("eap7_decimalfield2");//总体积
                                String warehouse = entry.getString("warehouse_number");//仓库编码
                                if(kingDeeUtilType.formId.equals("OUI_RECEIVEBIll")){

                                    memo = entry.getString("eap7_textfield3"); //备注（英文描述）
                                }else{
                                    memo = entry.getString("eap7_textfield5");
                                }
                                String pOrderNo = entry.getString("eap7_textfield");//采购单号
                                String s3 = entry.getString("eap7_textfield2");//客户sku（客户编号）
                                String s2 = entry.getString("eap7_textfield1"); //条码UPC
                                String memo = entry.getString("eap7_textfield5"); //备注（英文描述）
                                String s1 = entry.getString("eap7_textfield4"); //客户PO
                                String detlId = entry.getString("id"); //明细id
                                Long seq = entry.getLong("seq"); //分录行号
@@ -1626,9 +1643,11 @@
                                // ========= 明细去重 =========
                                List<OrderDetl> orderDetls =
                                        orderDetlService.selectByOrderId(order.getId());

                                boolean exists = orderDetls.stream()
                                        .anyMatch(o -> o.getMatnr().equals(matnr));
                                        .anyMatch(o ->
                                                o.getMatnr().equals(matnr) &&
                                                        o.getBoxType3().equals(pOrderNo)
                                        );
                                if (exists) continue;
//                                // ========= 供应商 =========
                                String supp = null;