diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java index 1c1dc95e7..994bdc076 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java @@ -103,5 +103,9 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity { /** 卸车确认 0未确认 1已确认*/ @ApiModelProperty(name = "卸车确认 0未确认 1已确认",notes = "") private Integer unloadCheck ; + /** 是否补录 0否 1是*/ + @ApiModelProperty(name = "是否补录 0否 1是",notes = "") + private Integer isSupple ; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index f9a47956d..787004e11 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -1243,12 +1243,15 @@ public class CarsLoadController { } @ResponseBody - @PostMapping("/addZeroSupple") + @PostMapping("/useZeroList") @ApiOperationSupport(order = 1) - @ApiOperation(value = "增加零担补录", notes = "传入loadCarsDTO") - public R addZeroSupple(@RequestBody LoadCarsDTO loadCarsDTO) { - String method = "############addZeroSupple: "; + @ApiOperation(value = "已使用的零担补录列表", notes = "传入loadCarsDTO") + public R useZeroList(@RequestBody LoadCarsDTO loadCarsDTO) { + String method = "############useZeroList: "; log.info(method+"请求参数{}",loadCarsDTO); + + Long loadId = loadCarsDTO.getLoadId();//配载id + try{ //当前登录人选择的仓库 @@ -1259,7 +1262,12 @@ public class CarsLoadController { } loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); - return carsLoadService.zeroSuppleList(loadCarsDTO); + if(Objects.isNull(loadId)){ + log.warn(method+"配载id为空 loadId={}",loadId); + return R.fail(405,"配载id为空"); + } + + return carsLoadService.useZeroList(loadCarsDTO); }catch (CustomerException e){ log.error(e.message,e); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java index 04dd30f40..863a412a8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.trunkline.dto.LoadCarsDTO; @@ -30,4 +31,9 @@ public interface TrunklineCarsLoadMapper extends BaseMapper arriveUnloadPageList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); List findUseOrderListNoPage(@Param("param") LoadCarsDTO loadCarsDTO); + + IPage findZeroListByWarehouseId(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); + + IPage useZeroList(IPage page, @Param("param") LoadCarsDTO loadCarsDTO); } + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 6629b6928..b6abfde35 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -339,4 +339,49 @@ + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java index 11dbd3d33..553454b7c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java @@ -117,4 +117,5 @@ public interface ITrunklineCarsLoadService extends BaseService page = new Page<>(); + page.setCurrent(loadCarsDTO.getPageNum()); + page.setSize(loadCarsDTO.getPageSize()); //查询当前仓零担在库列表 - IPage pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize); +// IPage pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize); + IPage pageList = baseMapper.findZeroListByWarehouseId(page,loadCarsDTO); + return R.data(pageList); + } + + @Override + public R useZeroList(LoadCarsDTO loadCarsDTO) { + IPage page = new Page<>(); + page.setCurrent(loadCarsDTO.getPageNum()); + page.setSize(loadCarsDTO.getPageSize()); + + IPage pageList = baseMapper.useZeroList(page,loadCarsDTO); + return R.data(pageList); }