Commit 1568b7c00949f83824b59b94aee4b263d8af0afe
1 parent
c1a37ed0
站台口增加传参
Showing
5 changed files
with
10 additions
and
8 deletions
ant-design-vue-jeecg/src/api/api.js
... | ... | @@ -160,7 +160,7 @@ export const createOverStationTask = (params) => postAction('/task/taskHeader/cr |
160 | 160 | //盘点任务创建 |
161 | 161 | export const stockTakeTask = (params,headerId,code) => postAction('/cycleCountDetail/cycleCountDetail/stockTakeTask?ids='+params+'&headerId='+headerId+'&code='+code, code); |
162 | 162 | //盘点任务生成 |
163 | -export const createCycleCoutTaskByDetailId = (params) => postAction('/cycleCountDetail/cycleCountDetail/createCycleCoutTaskByDetailId?cycleId='+params, params); | |
163 | +export const createCycleCoutTaskByDetailId = (params,toPort) => postAction('/cycleCountDetail/cycleCountDetail/createCycleCoutTaskByDetailId?cycleId='+params+'&toPort='+toPort, params); | |
164 | 164 | //盘点确定实盘数量 |
165 | 165 | export const confirmGapQty = (params) => postAction('/cycleCountDetail/cycleCountDetail/confirmGapQty', params); |
166 | 166 | //创建空托盘组入库任务 |
... | ... |
ant-design-vue-jeecg/src/views/system/stocktaking/modules/CycleCountSelectModal.vue
... | ... | @@ -53,7 +53,9 @@ export default { |
53 | 53 | title: "操作", |
54 | 54 | width: 500, |
55 | 55 | visible: false, |
56 | - model: {}, | |
56 | + model: { | |
57 | + toPort:'', | |
58 | + }, | |
57 | 59 | portList: [], |
58 | 60 | labelCol: { |
59 | 61 | xs: {span: 24}, |
... | ... | @@ -99,7 +101,7 @@ export default { |
99 | 101 | |
100 | 102 | if (valid) { |
101 | 103 | that.confirmLoading = true; |
102 | - createCycleCoutTaskByDetailId(this.modifyId).then((res) => { | |
104 | + createCycleCoutTaskByDetailId(this.modifyId,this.model.toPort).then((res) => { | |
103 | 105 | // alert("请求成功") |
104 | 106 | if (res.success) { |
105 | 107 | this.$message.success(res.message) |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
... | ... | @@ -204,12 +204,12 @@ public class CycleCountDetailController extends HuahengBaseController { |
204 | 204 | @AutoLog(value = "生成单条盘点任务") |
205 | 205 | @ApiOperation(value="生成单条盘点任务", notes="生成单条盘点任务") |
206 | 206 | @PostMapping(value = "/createCycleCoutTaskByDetailId") |
207 | - public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId, HttpServletRequest req){ | |
207 | + public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId,@RequestParam(name = "toPort") String toPort, HttpServletRequest req){ | |
208 | 208 | if(cycleId ==null){ |
209 | 209 | return Result.error("生成盘点任务时盘点明细ID不能为空!"); |
210 | 210 | } |
211 | 211 | String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req); |
212 | - return cycleCountDetailService.createCycleCoutTaskByDetailId(cycleId,warehouseCode); | |
212 | + return cycleCountDetailService.createCycleCoutTaskByDetailId(cycleId,toPort,warehouseCode); | |
213 | 213 | } |
214 | 214 | |
215 | 215 | |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
... | ... | @@ -40,6 +40,6 @@ public interface ICycleCountDetailService extends IService<CycleCountDetail> { |
40 | 40 | |
41 | 41 | Result stockDetailAdd(int taskId,int headerId,String code); |
42 | 42 | |
43 | - Result createCycleCoutTaskByDetailId(Integer cycleCoutdetailId,String warehouseCode); | |
43 | + Result createCycleCoutTaskByDetailId(Integer cycleCoutdetailId,String toPort,String warehouseCode); | |
44 | 44 | |
45 | 45 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
... | ... | @@ -198,7 +198,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap |
198 | 198 | * @return |
199 | 199 | */ |
200 | 200 | @Override |
201 | - public Result createCycleCoutTaskByDetailId(Integer cycleCoutDetailId,String warehouseCode) { | |
201 | + public Result createCycleCoutTaskByDetailId(Integer cycleCoutDetailId,String toPort,String warehouseCode) { | |
202 | 202 | /*任务主表中存在库位,在盘点明细中生成任务时,不同的容器生成不同的主任务*/ |
203 | 203 | //校验有没有相同容器正在执行任务. |
204 | 204 | CycleCountDetail cycleCountDetail = this.getById(cycleCoutDetailId); |
... | ... | @@ -244,7 +244,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap |
244 | 244 | task.setContainerCode(cycleCountDetail.getContainerCode()); |
245 | 245 | task.setStatus(QuantityConstant.TASK_STATUS_BUILD); |
246 | 246 | task.setFromLocationCode(cycleCountDetail.getLocationCode()); |
247 | - task.setToPortCode("P10"); | |
247 | + task.setToPortCode(toPort); | |
248 | 248 | task.setSequenceNumber(1); |
249 | 249 | task.setShipmentContainerHeaderId(cycleCoutDetailId); |
250 | 250 | task.setSequence(1); |
... | ... |