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

1

1 天以前 e596214d84efa77d0cf316563548f1b1d7643a37

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -200,7 +200,7 @@
                    continue;
                }
                if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
                    settle = 99L;//二次生成单据
                    settle = 98L;//二次生成单据前置  手动生成
                }
                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
                pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getQty()));