|
|
|
|
@ -20,23 +20,24 @@ 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.entity.DistributionReservationEntity; |
|
|
|
|
import com.logpm.distribution.entity.DistributionStockEntity; |
|
|
|
|
import com.logpm.distribution.service.IDistributionReservationService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockService; |
|
|
|
|
import com.logpm.distribution.service.IDistributionStockupService; |
|
|
|
|
import com.logpm.distribution.vo.*; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
|
import org.springblade.common.constant.RabbitConstant; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.boot.ctrl.BladeController; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.StringUtil; |
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 备货信息表 app控制器 |
|
|
|
|
@ -55,21 +56,27 @@ public class DistributionStockupAppController extends BladeController {
|
|
|
|
|
|
|
|
|
|
private final IDistributionReservationService distributionReservationService; |
|
|
|
|
|
|
|
|
|
private final IDistributionStockService distributionStockService; |
|
|
|
|
|
|
|
|
|
private final RabbitTemplate rabbitTemplate; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 备货信息表 分页列表 |
|
|
|
|
*/ |
|
|
|
|
@GetMapping("/pageList") |
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/pageList") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "分页列表", notes = "传入stockupDTO") |
|
|
|
|
public R<IPage<DistributionStockupListVO>> pageList(StockupDTO stockupDTO) { |
|
|
|
|
public R<IPage<DistributionStockupListVO>> pageList(@RequestBody StockupDTO stockupDTO) { |
|
|
|
|
IPage<DistributionStockupListVO> pages = distributionStockupService.selectStockupPage(stockupDTO); |
|
|
|
|
return R.data(pages); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/orderList") |
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/orderList") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "客户订单列表", notes = "传入stockupDTO") |
|
|
|
|
public R<Map<String,Object>> orderList(StockupDTO stockupDTO) { |
|
|
|
|
public R<Map<String,Object>> orderList(@RequestBody StockupDTO stockupDTO) { |
|
|
|
|
Integer orderStatus = stockupDTO.getOrderStatus(); |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
Long reservationId = stockupDTO.getReservationId(); |
|
|
|
|
@ -110,36 +117,43 @@ public class DistributionStockupAppController extends BladeController {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/orderInfo") |
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/orderInfo") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "客户订单列表", notes = "传入stockupDTO") |
|
|
|
|
public R orderInfo(StockupDTO stockupDTO) { |
|
|
|
|
public R orderInfo(@RequestBody StockupDTO stockupDTO) { |
|
|
|
|
log.info("##############orderInfo: {}",stockupDTO); |
|
|
|
|
Long reservationId = stockupDTO.getReservationId();//预约单id
|
|
|
|
|
String orderCode = stockupDTO.getOrderCode();//订单编号
|
|
|
|
|
Long stockArticleId = stockupDTO.getStockArticleId();//订单id
|
|
|
|
|
String descriptionGoods = stockupDTO.getDescriptionGoods();//物料名称
|
|
|
|
|
Long stockListId = stockupDTO.getStockListId();//库存品id
|
|
|
|
|
Integer orderStatus = stockupDTO.getOrderStatus();//1 客户订单 2库存品
|
|
|
|
|
String allocation = stockupDTO.getAllocation();//库位
|
|
|
|
|
String pallet = stockupDTO.getPallet();//托盘
|
|
|
|
|
String sku = stockupDTO.getSku(); |
|
|
|
|
String cargoNorms = stockupDTO.getCargoNorms();//规格
|
|
|
|
|
String cargoUnit = stockupDTO.getCargoUnit();//单位
|
|
|
|
|
String allocation = stockupDTO.getAllocation(); |
|
|
|
|
String pallet = stockupDTO.getPallet(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(orderStatus.equals(1)){ |
|
|
|
|
//查询客户订单详情
|
|
|
|
|
if(!StringUtil.hasLength(orderCode)){ |
|
|
|
|
log.warn("##############orderInfo: 订单编号为空 orderCode={}",orderCode); |
|
|
|
|
return R.fail("订单编号为空"); |
|
|
|
|
if(Objects.isNull(stockArticleId)){ |
|
|
|
|
log.warn("##############orderInfo: 订单id为空 stockArticleId={}",stockArticleId); |
|
|
|
|
return R.fail("订单id为空"); |
|
|
|
|
} |
|
|
|
|
if(StringUtil.isBlank(allocation)){ |
|
|
|
|
log.warn("##############orderInfo: 库位为空 allocation={}",allocation); |
|
|
|
|
return R.fail("库位为空"); |
|
|
|
|
} |
|
|
|
|
if(StringUtil.isBlank(pallet)){ |
|
|
|
|
log.warn("##############orderInfo: 托盘为空 pallet={}",pallet); |
|
|
|
|
return R.fail("托盘为空"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
DistributionStockupOrderInfoVO infoVO = distributionStockupService.selectOrderInfo(reservationId,stockArticleId,allocation,pallet); |
|
|
|
|
return R.data(infoVO); |
|
|
|
|
}else if(orderStatus.equals(2)){ |
|
|
|
|
if(!StringUtil.hasLength(descriptionGoods)){ |
|
|
|
|
log.warn("##############orderInfo: 物料名称为空 descriptionGoods={}",descriptionGoods); |
|
|
|
|
return R.fail("物料名称为空"); |
|
|
|
|
if(Objects.isNull(stockListId)){ |
|
|
|
|
log.warn("##############orderInfo: 库存品id为空 stockListId={}",stockListId); |
|
|
|
|
return R.fail("库存品id为空"); |
|
|
|
|
} |
|
|
|
|
DistributionStockupStockListInfoVO infoVO = distributionStockupService.selectStockListInfo(reservationId,descriptionGoods,allocation,pallet,sku,cargoNorms,cargoUnit); |
|
|
|
|
DistributionStockupStockListInfoVO infoVO = distributionStockupService.selectStockListInfo(reservationId,stockListId); |
|
|
|
|
return R.data(infoVO); |
|
|
|
|
}else{ |
|
|
|
|
log.warn("##############orderInfo: 未知的查询类型 orderStatus={}",orderStatus); |
|
|
|
|
@ -147,6 +161,103 @@ public class DistributionStockupAppController extends BladeController {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/stockupScan") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "备货扫描", notes = "传入stockupDTO") |
|
|
|
|
public R stockupScan(@RequestBody StockupDTO stockupDTO) { |
|
|
|
|
Integer scanType = stockupDTO.getScanType();//扫码类型
|
|
|
|
|
|
|
|
|
|
if(scanType == 1){ |
|
|
|
|
//包件扫描
|
|
|
|
|
String orderCode = stockupDTO.getOrderCode();//订单自编号
|
|
|
|
|
String packetBarCode = stockupDTO.getPacketBarCode();//包件码
|
|
|
|
|
String stockupArea = stockupDTO.getStockupArea();//备货区
|
|
|
|
|
Long reservationId = stockupDTO.getReservationId();//预约单id
|
|
|
|
|
if(StringUtil.isBlank(orderCode)){ |
|
|
|
|
log.warn("##################stockupScan: 包件扫码，订单自编号为空"); |
|
|
|
|
return R.fail("包件扫码:订单自编号不能为空"); |
|
|
|
|
} |
|
|
|
|
if(StringUtil.isBlank(packetBarCode)){ |
|
|
|
|
log.warn("##################stockupScan: 包件扫码，包件码为空"); |
|
|
|
|
return R.fail("包件扫码:包件码不能为空"); |
|
|
|
|
} |
|
|
|
|
if(StringUtil.isBlank(stockupArea)){ |
|
|
|
|
log.warn("##################stockupScan: 包件扫码，备货区为空"); |
|
|
|
|
return R.fail("包件扫码:备货区不能为空"); |
|
|
|
|
} |
|
|
|
|
if(Objects.isNull(reservationId)){ |
|
|
|
|
log.warn("##################stockupScan: 包件扫码，预约单id为空"); |
|
|
|
|
return R.fail("包件扫码:预约单id不能为空"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//先保存扫码包件信息,后续由队列来出来余下补充信息
|
|
|
|
|
DistributionStockEntity entity = new DistributionStockEntity(); |
|
|
|
|
entity.setOrderSelfNumbering(orderCode); |
|
|
|
|
entity.setCoding(packetBarCode); |
|
|
|
|
entity.setStockupArea(stockupArea); |
|
|
|
|
entity.setReservationId(reservationId); |
|
|
|
|
entity.setConditions(0); |
|
|
|
|
distributionStockService.save(entity); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("messageId", CommonUtil.getUUID()); |
|
|
|
|
map.put("scanType", scanType); |
|
|
|
|
map.put("logId", entity.getId()); |
|
|
|
|
map.put("messageData", entity); |
|
|
|
|
map.put("createTime", new Date().getTime()); |
|
|
|
|
//将消息携带绑定键值
|
|
|
|
|
rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map); |
|
|
|
|
|
|
|
|
|
return R.success("扫码成功"); |
|
|
|
|
}else if(scanType == 2){ |
|
|
|
|
//库存品扫描
|
|
|
|
|
Long reservationId = stockupDTO.getReservationId(); |
|
|
|
|
Long stockListId = stockupDTO.getStockListId(); |
|
|
|
|
String packetBarCode = stockupDTO.getPacketBarCode(); |
|
|
|
|
String stockupArea = stockupDTO.getStockupArea();//备货区
|
|
|
|
|
if(StringUtil.isBlank(packetBarCode)){ |
|
|
|
|
log.warn("##################stockupScan: 库存品扫码，包件码为空"); |
|
|
|
|
return R.fail("库存品扫码:包件码不能为空"); |
|
|
|
|
} |
|
|
|
|
if(StringUtil.isBlank(stockupArea)){ |
|
|
|
|
log.warn("##################stockupScan: 库存品扫码，备货区为空"); |
|
|
|
|
return R.fail("库存品扫码:备货区不能为空"); |
|
|
|
|
} |
|
|
|
|
if(Objects.isNull(stockListId)){ |
|
|
|
|
log.warn("##################stockupScan: 库存品扫码，库存品id为空"); |
|
|
|
|
return R.fail("库存品扫码:库存品id不能为空"); |
|
|
|
|
} |
|
|
|
|
if(Objects.isNull(reservationId)){ |
|
|
|
|
log.warn("##################stockupScan: 库存品扫码，预约单id为空"); |
|
|
|
|
return R.fail("库存品扫码:预约单id不能为空"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//先保存扫码包件信息,后续由队列来出来余下补充信息
|
|
|
|
|
DistributionStockEntity entity = new DistributionStockEntity(); |
|
|
|
|
entity.setCoding(packetBarCode); |
|
|
|
|
entity.setStockupArea(stockupArea); |
|
|
|
|
entity.setReservationId(reservationId); |
|
|
|
|
entity.setStockListId(stockListId); |
|
|
|
|
entity.setConditions(0); |
|
|
|
|
distributionStockService.save(entity); |
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("messageId", CommonUtil.getUUID()); |
|
|
|
|
map.put("scanType", scanType); |
|
|
|
|
map.put("logId", entity.getId()); |
|
|
|
|
map.put("messageData", entity); |
|
|
|
|
map.put("createTime", new Date().getTime()); |
|
|
|
|
//将消息携带绑定键值
|
|
|
|
|
rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map); |
|
|
|
|
|
|
|
|
|
return R.success("扫码成功"); |
|
|
|
|
}else{ |
|
|
|
|
log.warn("###################stockupScan: 未知的扫码类型 scanType={}",scanType); |
|
|
|
|
return R.fail("未知的扫码类型"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
pref_mail@163.com
2 years ago