From 7bb6b996d2993ea2f6cb20132316c0fc6885cb6d Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 16 一月 2026 13:29:44 +0800
Subject: [PATCH] #pda-订单出库
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java | 7 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 8 ++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 53 +++++++++++++++++++++-----
3 files changed, 57 insertions(+), 11 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 3aea7ee..9710717 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,19 +2,16 @@
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.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.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.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;
@@ -28,7 +25,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -103,16 +99,53 @@
}
@PostMapping("/orderOut/getType")
- public R orderOutGetType(@RequestBody OrderOutGetType orderOutGetType) {
- if (Cools.isEmpty(orderOutGetType)){
+ 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, orderOutGetType.getType())
+ .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()
+
+ return R.ok();
+ }
+
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGetType.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
similarity index 65%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGetType.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
index e0bd72c..4e6ae09 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGetType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/OrderOutGeneralParam.java
@@ -5,7 +5,12 @@
import java.util.List;
@Data
-public class OrderOutGetType {
+public class OrderOutGeneralParam {
+
private List<Long> type;
+
+ private Long orderItemId;
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 6ffd890..e72977c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -337,6 +338,13 @@
// null // 澶囨敞
// );
+ public BigDecimal getAbleQty() {
+ BigDecimal anfmeDec = new BigDecimal(anfme.toString());
+ BigDecimal qtyDec = new BigDecimal(qty.toString());
+
+ return anfmeDec.subtract(qtyDec);
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1