From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 27 十二月 2023 21:52:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion --- src/main/java/com/zy/asrs/service/MobileService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java index 6172647..d1d65fc 100644 --- a/src/main/java/com/zy/asrs/service/MobileService.java +++ b/src/main/java/com/zy/asrs/service/MobileService.java @@ -1,12 +1,14 @@ package com.zy.asrs.service; import com.alibaba.fastjson.JSONObject; +import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.CombParam; import com.zy.asrs.entity.param.MobileAdjustParam; import com.zy.asrs.entity.param.OffSaleParam; +import com.zy.system.entity.User; import java.util.Date; @@ -32,10 +34,17 @@ */ void adjust(MobileAdjustParam param, Long userId); - void packComb(CombParam param, Long userId); +// void packComb(CombParam param, Long userId); void pakoutByOrder(JSONObject param, Long userId); void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl, Double curOutQty, Integer ioType, Long userId, Date now); + + R manDetlIn(JSONObject json ,User user); + + R manDetlOut(JSONObject json,User user); + R manDetlInBarcode(JSONObject json ,User user); + + R barcodeDelete(JSONObject json, User user); } -- Gitblit v1.9.1