Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing

ZY

2024-09-21 01824c5104590b96a3040faa317969bcd812bcca

Merge branch 'xgmFlasrs' into xgmFlasrs2
hebing

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -102,6 +102,7 @@
                                if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
                                    OrderDetl newOrderDetl = new OrderDetl();
                                    newOrderDetl.sync(wrkDetl);
                                    newOrderDetl.setAnfme(orderDetl.getAnfme());
                                    newOrderDetl.setQty(orderDetl.getAnfme());
                                    newOrderDetl.setOrderId(order.getId());
                                    newOrderDetl.setOrderNo(orderNo);
@@ -119,6 +120,7 @@
                                if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
                                    OrderDetl newOrderDetl = new OrderDetl();
                                    newOrderDetl.sync(wrkDetl);
                                    newOrderDetl.setAnfme(orderDetl.getAnfme());
                                    newOrderDetl.setQty(orderDetl.getAnfme());
                                    newOrderDetl.setOrderId(order.getId());
                                    newOrderDetl.setOrderNo(orderNo);

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -28,7 +28,8 @@
     **/
    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
        // 如果源库位是高库位，目标库位是低库位
        return dto.getLocType1().equals(loc.getLocType1());

        return loc.getLocType1() >= dto.getLocType1();
    }

}

 src/main/java/com/zy/third/erp/task/ERPItemService.java

@@ -77,10 +77,14 @@
                    }
                }
            }
            priTag = tagService.selectByName(itemTB.getItemKind(), 2);
            mat = sync(mat, itemTB);
            if (!Cools.isEmpty(itemTB.getItemKind())) {
                priTag = tagService.selectByName(itemTB.getItemKind(), 2);
            }

            mat.setTagId(priTag.getId());
            mat = sync(mat, itemTB);
            if (priTag!=null){
                mat.setTagId(priTag.getId());
            }
            mat.setStatus(1);
            mat.setCreateTime(now);
            mat.setUpdateTime(now);