From e07b5ecacc2476cf551d665af92d3bb902aa0e90 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 17:24:24 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 98 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index a42d090..c7921b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -2,17 +2,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.CallForEmptyContainersParam;
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
+import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
-import com.vincent.rsf.server.common.domain.BaseParam;
-import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -23,7 +26,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -38,8 +40,9 @@
private OutStockService outStockService;
@Resource
private OutStockItemService outStockItemService;
+ @Autowired
+ private DictDataService dictDataService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/outStockTaskItem/{barcode}")
@ApiOperation("蹇�熸嫞璐ф煡璇�")
public R getOutStockTaskItem(@PathVariable String barcode) {
@@ -47,7 +50,6 @@
return pdaOutStockService.getOutStockTaskItem(barcode);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/saveOutTaskSts/{barcode}")
@ApiOperation("蹇�熸嫞璐�")
public R saveOutTaskSts(@PathVariable String barcode) {
@@ -55,7 +57,6 @@
return pdaOutStockService.saveOutTaskSts(barcode);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getWaveList")
@ApiOperation("鏌ヨ娉㈡鍒楄〃")
public R getWaveListItem(@RequestBody Map<String, String> map) {
@@ -63,7 +64,6 @@
return pdaOutStockService.getWaveListItem(map.get("barcode"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getContainerWaveList")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
public R getContainerWaveList(@RequestBody Map<String, String> map) {
@@ -71,19 +71,89 @@
return pdaOutStockService.getContainerWaveList(map);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveWavePick")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
public R saveWavePick(@RequestBody ContainerWaveParam containerWaveParam) {
- return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
+ return pdaOutStockService.saveWavePick(containerWaveParam, getLoginUserId());
}
-// @PreAuthorize("hasAuthority('manager:outStock:list')")
+ @PostMapping("/callForEmptyContainers")
+ @ApiOperation("鍛煎彨绌哄鍣�")
+ public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) {
+
+ return pdaOutStockService.callForEmptyContainers(containerWaveParam, getLoginUserId());
+ }
+
+ // @PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/outStockItem/page")
public R page(@RequestBody JSONObject param) {
- return R.ok().add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0)
- .eq(WkOrderItem::getOrderCode, param.getString("orderId"))));
+ return R.ok()
+ .add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0)
+ .eq(WkOrderItem::getOrderCode, param.getString("orderId"))));
}
+
+ @PostMapping("/orderOut/getType")
+ public R orderOutGetType(@RequestBody OrderOutGeneralParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.ok();
+ }
+
+ List<DictData> dictData = dictDataService.list(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
+ .in(DictData::getValue, param.getType()));
+ return R.ok(dictData);
+ }
+
+ @RequestMapping(value = "/orderOut/list")
+ public R pdaPageList(@RequestParam(required = true) String orderNo,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "5") Integer limit) {
+
+ Page<WkOrder> page = new Page<>(curr, limit);
+ LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
+ wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
+ Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
+ return R.ok(wkOrderPage);
+ }
+
+ @RequestMapping(value = "/orderOut/detlList")
+ public R orderOutDetlList(@RequestParam(required = true) String orderNo) {
+
+ if (Cools.isEmpty(orderNo)) {
+ return R.error("璁㈠崟鍙蜂负绌�");
+ }
+
+ LambdaQueryWrapper<WkOrderItem> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ // wkOrderLambdaQueryWrapper.eq(WkOrderItem::getType, OrderType.ORDER_OUT.type);
+ wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrderItem::getOrderCode, orderNo);
+ List<WkOrderItem> list = outStockItemService.list(wkOrderLambdaQueryWrapper);
+ return R.ok(list);
+
+ }
+
+ @PostMapping("/orderOut/getOutLocView")
+ public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
+ //鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
+ if (Cools.isEmpty(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
+ orderOutTaskParam.setOrderId(param.getOrderItemId());
+ orderOutTaskParam.setWaveId(param.getWaveId());
+
+ return outStockService.getOrderOutTaskItem(orderOutTaskParam);
+
+// return R.ok();
+ }
+ //
+ @PostMapping("/orderOut/getOutLocRun")
+ public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
+ //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1