From fa5f9ce7f052bcf613c1459be98eb70bdc4de346 Mon Sep 17 00:00:00 2001
From: zf <27208084@qq.com>
Date: Tue, 10 Jan 2023 09:49:09 +0800
Subject: [PATCH] 呼叫出库料盒
---
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java | 51 ++++++++++++++++-----------------------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
index b5c467a..05f98fc 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
@@ -1,63 +1,44 @@
package org.jeecg.modules.wms.api.mobile.controller;
-
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.modules.wms.api.erp.service.IErpService;
import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
import org.jeecg.modules.wms.api.mobile.service.IMobileService;
-import org.jeecg.modules.wms.config.container.entity.Container;
-import org.jeecg.modules.wms.config.container.service.IContainerService;
-import org.jeecg.modules.wms.config.location.entity.Location;
-import org.jeecg.modules.wms.config.location.service.ILocationService;
import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
import org.jeecg.modules.wms.framework.controller.BaseController;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
-import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
/**
- * @author 游杰
+ * * PDA出库接口，整合复用PC端service层接口
*/
+@Api(tags="Mobile")
@RestController
-@RequestMapping("/mobile/receipt")
-public class ReceiptController extends BaseController {
-
+@RequestMapping("/mobile/shipment")
+public class ShipmentController extends BaseController {
@Resource
private IMobileService mobileService;
+ @AutoLog(value = "PDA出库-呼叫料盒")
+ @ApiOperation(value="PDA出库-呼叫料盒", notes="创建空的分拣出库任务，并返回任务id")
@PostMapping("/callbox")
@ResponseBody
- @ApiLogger(apiName = "呼叫入库料盒", from="PDA")
- public Result callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
- String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
-
- if(StringUtils.isEmpty(bean.getContainerCode())){
- return Result.error("托盘号containerCode不能为空");
- }
-
- if(StringUtils.isEmpty(bean.getLocationCode())){
- return Result.error("库位locationCode不能为空");
- }
-
- if(StringUtils.isEmpty(bean.getCompanyCode())){
- return Result.error("货主companyCode不能为空");
- }
+ @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
+ public Result<Integer> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
- //补充入库类型
- bean.setType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
+ //补充入库类型
+ bean.setType(QuantityConstant.TASK_TYPE_SORTINGSHIPMENT);
- Result result = handleMultiProcess("receipt", new JeecgController.MultiProcessListener() {
+ Result result = handleMultiProcess("callBox", new JeecgController.MultiProcessListener() {
@Override
public Result doProcess() {
return mobileService.callBox(bean, warehouseCode);
--
libgit2 0.22.2