Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

6 天以前 6fd5d255ffb664241ac081b6b09fc1cda32abd7f

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java

@@ -26,7 +26,7 @@

    R getOrderByCode(String barcode);

    R receiptToWarehouse(Map<String, Object> orders);
    R receiptToWarehouse(Map<String, Object> orders, Long loginUserId);

    R otherReceipt(OtherReceiptParams params);

@@ -36,9 +36,10 @@

    List<Fields> getDynamicFields();

    R getDeltByCode(String code);
    R getDeltByCode(Map<String, Object> params);

    WaitPakin mergeItems(WaitPakinParam waitPakin);
    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);


    WaitPakin unBind(WaitPakinParam param);

@@ -63,4 +64,12 @@
    R getItemByContainer(Map<String, Object> params);

    R defectProducts(String trackCode);

    R getPakinInStock(String barcode);

    R getDeviceSites();

    R getRecommondLocs();

    R generateTask(Map<String, Object> map, Long loginUserId);
}