#

1

7 小时以前 fe3b6f1f3163be94496e5d5e72654f22ae131245

 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;
@@ -1628,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;
@@ -1654,9 +1671,9 @@
                                orderDetl.setSupp(supp);
                                orderDetl.setSuppCode(suppCode);
                                orderDetl.setSku(matnr);
                                orderDetl.setStandby1(s1 != null? s1:"1");
                                orderDetl.setStandby2(s2 != null? s2:"1");
                                orderDetl.setStandby3(s3 != null? s3:"1");
                                orderDetl.setStandby1(Cools.isEmpty(s1) ? "1" : s1);
                                orderDetl.setStandby2(Cools.isEmpty(s2) ? "1" : s2);
                                orderDetl.setStandby3(Cools.isEmpty(s3) ? "1" : s3);
                                orderDetl.setBoxType1(owner);
                                orderDetl.setBoxType2(ownerUuid);
                                orderDetl.setBoxType3(pOrderNo);