diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index df48d1e8b..b221f489a 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -46,6 +46,8 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; + +import java.util.Calendar; import java.util.Map; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -91,6 +93,21 @@ public class AftersalesWorkOrderController extends BladeController { return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages)); } + /** + * 客服异常工单 查询异常完整数据集合 + */ + @GetMapping("/listOwn") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入aftersalesWorkOrder") + public R> getListOwn(@ApiIgnore @RequestParam Map aftersalesWorkOrder, Query query) { + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(ObjectUtils.isNotNull(myCurrentWarehouse)){ + aftersalesWorkOrder.put("warehouseId", myCurrentWarehouse.getId()); + } + IPage pages = aftersalesWorkOrderService.pageListOwn(aftersalesWorkOrder, Condition.getPage(query)); + return R.data(AftersalesWorkOrderWrapper.build().pageVO(pages)); + } + /** * 客服异常工单 自定义分页 */ @@ -118,7 +135,7 @@ public class AftersalesWorkOrderController extends BladeController { */ @PostMapping("/addCompletionEnd") @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入aftersalesWorkOrder") + @ApiOperation(value = "完结处理", notes = "传入aftersalesWorkOrder") public R addCompletionEnd(@Valid @RequestBody List aftersalesWorkOrder) { return R.status(aftersalesWorkOrderService.addCompletionEnd(aftersalesWorkOrder)); diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index f21ee8adf..be2067b41 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -24,6 +24,7 @@ import com.logpm.aftersales.excel.AftersalesWorkOrderExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 客服异常工单 服务类 @@ -71,4 +72,13 @@ public interface IAftersalesWorkOrderService extends BaseService aftersalesWorkOrder); + + /** + * 查询异常完整数据集合 + * + * @param aftersalesWorkOrder + * @param page + * @return + */ + IPage pageListOwn(Map aftersalesWorkOrder, IPage page); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 14e561878..a823b7ea6 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -46,6 +46,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * 客服异常工单 服务实现类 @@ -243,4 +244,16 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl pageListOwn(Map aftersalesWorkOrder, IPage page) { + return null; + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index f3704530c..3bdd5f402 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -306,7 +306,7 @@ ldslNew.cargo_unit AS cargoUnit, ldslNew.tray_name AS trayName, ldslNew.unpack AS unpack, - (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id = t.id AND lds.is_deleted = 0) AS realNum, + (SELECT count(*) FROM logpm_distribution_stock AS lds WHERE lds.stock_list_id =#{reservationId} AND lds.is_deleted = 0) AS realNum, t.reservationNum as planNum, ( select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in ( @@ -462,12 +462,12 @@