From 9598da0195806329f911f6d5b73573b429f1926c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 15 一月 2026 09:56:23 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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 b50b876..3aea7ee 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
@@ -1,16 +1,34 @@
package com.vincent.rsf.server.api.controller.pda;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.common.SpringUtils;
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.OrderOutGetType;
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.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
+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;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -21,6 +39,12 @@
@Autowired
private PdaOutStockService pdaOutStockService;
+ @Resource
+ private OutStockService outStockService;
+ @Resource
+ private OutStockItemService outStockItemService;
+ @Autowired
+ private DictDataService dictDataService;
@PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/outStockTaskItem/{barcode}")
@@ -61,4 +85,34 @@
return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
+
+ @PreAuthorize("hasAuthority('manager:task: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"))));
+ }
+
+ @PostMapping("/orderOut/getType")
+ public R orderOutGetType(@RequestBody OrderOutGetType orderOutGetType) {
+ if (Cools.isEmpty(orderOutGetType)){
+ return R.ok();
+ }
+
+ List<DictData> dictData = dictDataService.list(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
+ .in(DictData::getValue, orderOutGetType.getType())
+ );
+ return R.ok(dictData);
+ }
+
}
--
Gitblit v1.9.1