zhenghaoyu
2 years ago
19 changed files with 621 additions and 24 deletions
@ -0,0 +1,55 @@
|
||||
package com.logpm.distribution.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
@Data |
||||
@TableName("logpm_distribution_stockup_scan") |
||||
@ApiModel(value = "ReservationStockupScan对象", description = "备货扫描表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class DistributionStockupScan extends TenantEntity { |
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
|
||||
@ApiModelProperty(value = "包件码") |
||||
private String packetBarCode; |
||||
|
||||
@ApiModelProperty(value = "节点") |
||||
private Integer nodeType; |
||||
|
||||
@ApiModelProperty(value = "扫码类型 1 pda扫码 2 手填") |
||||
private Integer scanType; |
||||
|
||||
@ApiModelProperty(value = "包件类型 1 包件 2 库存品") |
||||
private Integer packageType; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,32 @@
|
||||
package com.logpm.distribution.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class DistributionStockupListVO implements Serializable { |
||||
|
||||
private Long reservationId;//预约单id
|
||||
|
||||
private Integer typeService;//服务类型
|
||||
private String typeServiceStr; |
||||
|
||||
private Integer stockupStatus;//备货状态
|
||||
private String stockupStatusStr; |
||||
|
||||
private String customer;//客户
|
||||
|
||||
private String stockupArea;//备货区
|
||||
|
||||
private String warehouseArea;//库位
|
||||
|
||||
private String trays;//托盘
|
||||
|
||||
private Integer orderNum;//订单总数
|
||||
|
||||
private Integer planNum;//计划件数
|
||||
|
||||
private Integer realNum;//件数
|
||||
|
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.logpm.distribution.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 备货客户订单列表 |
||||
*/ |
||||
@Data |
||||
public class DistributionStockupOrderListVO implements Serializable { |
||||
|
||||
private String allocation;//库位
|
||||
|
||||
private String orderCode;//订单编号
|
||||
|
||||
private String pallet;//托盘
|
||||
|
||||
private Integer containerNum;//容器件数
|
||||
|
||||
private Integer planNum;//计划件数
|
||||
|
||||
private Integer scanNum;//扫描件数
|
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.distribution.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class DistributionStockupStockListVO implements Serializable { |
||||
|
||||
|
||||
// private String
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,55 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.distribution.appcontroller; |
||||
|
||||
import com.logpm.distribution.service.IDistributionReservationService; |
||||
import io.swagger.annotations.Api; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
/** |
||||
* 预约列表 控制器 |
||||
* |
||||
* @author TJJ |
||||
* @since 2023-06-12 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/app/reservation") |
||||
@Api(value = "预约列表", tags = "预约列表接口") |
||||
public class DistributionReservationAppController extends BladeController { |
||||
|
||||
private final IDistributionReservationService reservationService; |
||||
|
||||
// /**
|
||||
// * 预约列表 详情
|
||||
// */
|
||||
// @GetMapping("/list")
|
||||
// @ApiOperationSupport(order = 1)
|
||||
// @ApiOperation(value = "详情", notes = "传入distrbutionReservation")
|
||||
// public R<DistributionReservationEntity> detail(DistributionReservationEntity distributionReservationEntity) {
|
||||
//// DistributionReservationVO distributionReservationVO = reservationService.getReservationDetail(reservationId);
|
||||
// DistributionReservationEntity detail = reservationService.getOne(Condition.getQueryWrapper(distributionReservationEntity));
|
||||
// return R.data(detail);
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,83 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.distribution.appcontroller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.distribution.dto.app.StockupDTO; |
||||
import com.logpm.distribution.service.IDistributionStockupService; |
||||
import com.logpm.distribution.vo.DistributionStockupListVO; |
||||
import com.logpm.distribution.vo.DistributionStockupOrderListVO; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 备货信息表 app控制器 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-07-19 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/app/distributionStockup") |
||||
@Api(value = "备货信息表", tags = "备货信息表接口") |
||||
public class DistributionStockupAppController extends BladeController { |
||||
|
||||
private final IDistributionStockupService distributionStockupService; |
||||
|
||||
/** |
||||
* 备货信息表 分页列表 |
||||
*/ |
||||
@GetMapping("/pageList") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "分页列表", notes = "传入stockupDTO") |
||||
public R<IPage<DistributionStockupListVO>> pageList(StockupDTO stockupDTO) { |
||||
IPage<DistributionStockupListVO> pages = distributionStockupService.selectStockupPage(stockupDTO); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
@GetMapping("/orderList") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "分页列表", notes = "传入stockupDTO") |
||||
public R<Map<String,Object>> orderList(StockupDTO stockupDTO) { |
||||
Integer orderStatus = stockupDTO.getOrderStatus(); |
||||
Map<String,Object> map = new HashMap<>(); |
||||
if(orderStatus.equals(1)) { |
||||
//查询客户订单对应的
|
||||
List<DistributionStockupOrderListVO> list = distributionStockupService.selectStockupOrderList(stockupDTO); |
||||
map.put("orderList",list); |
||||
}else if(orderStatus.equals(2)){ |
||||
//查询客户订单对应的库存品
|
||||
// List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupStockList(stockupDTO);
|
||||
}else{ |
||||
return R.fail("未知的查询类型"); |
||||
} |
||||
return R.data(map); |
||||
} |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,24 @@
|
||||
package com.logpm.distribution.dto.app; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class StockupDTO implements Serializable { |
||||
|
||||
private String stockupDate;//备货日期
|
||||
|
||||
private Integer status;//0未完成 1已完成
|
||||
|
||||
@ApiModelProperty("当前页") |
||||
private Integer currentPage; |
||||
@ApiModelProperty("每页的数量") |
||||
private Integer size; |
||||
|
||||
private Integer orderStatus;//1 客户订单 2库存品
|
||||
|
||||
private Long reservationId;//预约单id
|
||||
|
||||
} |
||||
@ -0,0 +1,48 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package wrapper; |
||||
|
||||
import com.logpm.distribution.entity.DistributionStockupEntity; |
||||
import com.logpm.distribution.vo.DistributionStockupVO; |
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 运单表 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-07-10 |
||||
*/ |
||||
public class DistributionStockupWrapper extends BaseEntityWrapper<DistributionStockupEntity, DistributionStockupVO> { |
||||
|
||||
public static DistributionStockupWrapper build() { |
||||
return new DistributionStockupWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public DistributionStockupVO entityVO(DistributionStockupEntity distributionStockupEntity) { |
||||
DistributionStockupVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(distributionStockupEntity, DistributionStockupVO.class)); |
||||
// String deliveryMethodStr = DictBizCache.getValue(DictBizConstant.DELIVERY_METHOD, distributionStockupVO.getDeliveryMethod());
|
||||
// distributionStockupVO.setDeliveryMethodStr(deliveryMethodStr);
|
||||
|
||||
return distributionStockupVO; |
||||
} |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue