From 258f0142619bb02db69c0f7006ca5bcc75d7a2e4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 15:35:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 d47a8cb..eb0b07f 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
@@ -8,14 +8,16 @@
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.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
+import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.entity.LocItem;
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.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.OutStockItemService;
-import com.vincent.rsf.server.manager.service.OutStockService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.DictData;
@@ -27,6 +29,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -45,6 +48,10 @@
private DictDataService dictDataService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private LocItemService locItemService;
@GetMapping("/outStockTaskItem/{barcode}")
@ApiOperation("蹇�熸嫞璐ф煡璇�")
@@ -151,12 +158,36 @@
return outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
}
- //
+ //q
@PostMapping("/orderOut/getOutLocRun")
public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
- //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
+ LocItem locItem = locItemService.getById(param.getItemId());
+ if (Cools.isEmpty(locItem)) {
+ return R.error().add("鏈煡璇㈠埌搴撳瓨鏄庣粏");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locItem.getLocCode()));
- return R.ok();
+ if (Cools.isEmpty(loc)) {
+ return R.error().add("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ WkOrderItem orderItem = asnOrderItemService.getById(param.getOrderItemId());
+
+
+ List<OutStockToTaskParams> tasks = new ArrayList<>();
+ OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderItem);
+ outStockToTaskParams.setLocCode(loc.getCode());
+ outStockToTaskParams.setId(locItem.getId());
+ outStockToTaskParams.setBarcode(loc.getBarcode());
+ outStockToTaskParams.setSiteNo(param.getOutSta());
+ outStockToTaskParams.setOutQty(param.getOutQty());
+ tasks.add(outStockToTaskParams);
+ return outStockService.genOutStockTask(tasks,getLoginUserId(), orderItem.getOrderId());
+ }
+
+ @PostMapping("/orderOut/containerRebinding")
+ @ApiOperation("澶囪揣瀹瑰櫒鎹㈢粦")
+ public R containerRebinding(@RequestBody PdaGeneralParam param) {
+ return pdaOutStockService.containerRebinding(param,getLoginUserId());
}
}
--
Gitblit v1.9.1