diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index 50b0afa..904b21c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -9,6 +9,10 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; +import com.ruoyi.out.outStockout.domain.OutStockout; +import com.ruoyi.out.outStockout.service.impl.OutStockoutServiceImpl; +import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail; +import com.ruoyi.out.outStockoutDetail.service.impl.OutStockoutDetailServiceImpl; import com.ruoyi.pda.domain.TrayCodeMakeSure; import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.service.PdaService; @@ -19,10 +23,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; @@ -36,6 +37,11 @@ public class PdaController extends BaseController { private PdaService pdaService; @Autowired private IInStockinDetailService iInStockinDetailService; + @Autowired + private OutStockoutServiceImpl outStockoutService; + + @Autowired + private OutStockoutDetailServiceImpl outStockoutDetailService; /** * 查询是否有半满托盘 @@ -228,6 +234,7 @@ public class PdaController extends BaseController { /** * 平库出库确认 + * * @param trayCodeMakeSure * @return */ @@ -256,5 +263,51 @@ public class PdaController extends BaseController { } + /** + * 查询平库出库主单 建议参数(erpStockOutId U8单据号作为查询条件传到后台) + * + * @param outStockout + * @return + */ + @RequestMapping("/OutFillPk") + @ResponseBody + + public List OutFillPk(@RequestBody OutStockout outStockout) { + outStockoutService.selectOutStockoutList(outStockout); + return null; + } + + + /** + * 查出平库出库子单 参数: stockoutId 作为参数传递到后台 + * + * @param outStockout + * @return + */ + @RequestMapping("/OutFillPkDetail") + @ResponseBody + public List OutFillPkDetail(@RequestBody OutStockout outStockout) { + List outStockouts = outStockoutService.selectOutStockoutList(outStockout); + outStockoutDetailService.selectOutStockoutDetailByStockoutGuid(outStockouts.get(0).getStockoutId()); + return null; + } + + + /** + * 查询平库出库子单对应信息 在平库中是否存在 + * 参数:trayCode 托盘码 + * 参数:stockinDetailId 子单据号 + * + * @param trayCodeMsg + * @return + */ + @RequestMapping("/queryBasStockHc") + @ResponseBody + public AjaxResult queryBasStockHc(@RequestBody TrayCodeMsg trayCodeMsg) { + + return AjaxResult.success(); + } + + }