|
|
|
|
@ -3,8 +3,10 @@ package com.logpm.warehouse.api;
|
|
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
|
|
|
import com.logpm.warehouse.dto.CheckDTO; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseInventoryService; |
|
|
|
|
import com.logpm.warehouse.service.IWarehouseUpdownTypeService; |
|
|
|
|
import com.logpm.warehouse.vo.ReCheckOrderVO; |
|
|
|
|
import com.logpm.warehouse.vo.ReCheckTrayVO; |
|
|
|
|
import com.logpm.warehouse.vo.TragetAllocationVO; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
@ -25,35 +27,61 @@ public class WarehouseInventoryApiController {
|
|
|
|
|
|
|
|
|
|
private final IWarehouseInventoryService warehouseInventoryService; |
|
|
|
|
|
|
|
|
|
private final IWarehouseUpdownTypeService warehouseUpdownTypeService; |
|
|
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/checkGoodsByType") |
|
|
|
|
@PostMapping("/checkGoodsByOrder") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "通过不同码值复核", notes = "传入checkDTO") |
|
|
|
|
public R checkGoodsByType(@RequestBody CheckDTO checkDTO) { |
|
|
|
|
String method = "###########checkGoodsByType: "; |
|
|
|
|
log.info(method + "上架扫码货物 checkDTO={}", checkDTO); |
|
|
|
|
Integer codeType = checkDTO.getCodeType();//码值类型 1包条码 2托盘码 3库位码
|
|
|
|
|
String code = checkDTO.getCode();//码值
|
|
|
|
|
@ApiOperation(value = "复核订单", notes = "传入checkDTO") |
|
|
|
|
public R checkGoodsByOrder(@RequestBody CheckDTO checkDTO) { |
|
|
|
|
String method = "###########checkGoodsByOrder: "; |
|
|
|
|
log.info(method + "复核订单 checkDTO={}", checkDTO); |
|
|
|
|
// Integer codeType = checkDTO.getCodeType();//码值类型 1订单号 2运单号
|
|
|
|
|
String orderPackageCode = checkDTO.getCode();//包件码
|
|
|
|
|
try{ |
|
|
|
|
if(!StringUtil.hasLength(code)){ |
|
|
|
|
log.warn(method+"码值不能为空 code={}",code); |
|
|
|
|
return R.fail(403,"码值不能为空"); |
|
|
|
|
} |
|
|
|
|
if(Objects.isNull(codeType)){ |
|
|
|
|
log.warn(method+"码值类型不能为空 codeType={}",codeType); |
|
|
|
|
return R.fail(403,"码值类型不能为空"); |
|
|
|
|
if(!StringUtil.hasLength(orderPackageCode)){ |
|
|
|
|
log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode); |
|
|
|
|
return R.fail(403,"包件码不能为空"); |
|
|
|
|
} |
|
|
|
|
// if(Objects.isNull(codeType)){
|
|
|
|
|
// log.warn(method+"码值类型不能为空 codeType={}",codeType);
|
|
|
|
|
// return R.fail(403,"码值类型不能为空");
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//查询该库位的货物信息
|
|
|
|
|
if(codeType == 1){ |
|
|
|
|
ReCheckOrderVO reCheckOrderVO = warehouseInventoryService.getReCheckOrder(code); |
|
|
|
|
}else if(codeType == 2){ |
|
|
|
|
ReCheckTrayVO reCheckTrayVOS = warehouseInventoryService.getReCheckTray(code); |
|
|
|
|
} |
|
|
|
|
ReCheckOrderVO reCheckOrderVO = warehouseInventoryService.getReCheckOrder(orderPackageCode); |
|
|
|
|
return R.data(reCheckOrderVO); |
|
|
|
|
}catch (CustomerException e){ |
|
|
|
|
log.warn(e.message); |
|
|
|
|
return R.fail(e.code,e.message); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
log.error(method+"系统异常，联系管理员",e); |
|
|
|
|
return R.fail(500,"系统异常，联系管理员"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// List<ReCheckAllocationVO> upShelfDataVOs = warehouseUpdownTypeService.findUpShelfScanGoods(code,upshelfScanType);
|
|
|
|
|
return R.success("success"); |
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/checkGoodsByTray") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "复核托盘", notes = "传入checkDTO") |
|
|
|
|
public R checkGoodsByTray(@RequestBody CheckDTO checkDTO) { |
|
|
|
|
String method = "###########checkGoodsByTray: "; |
|
|
|
|
log.info(method + "复核托盘 checkDTO={}", checkDTO); |
|
|
|
|
String trayCode = checkDTO.getTrayCode(); |
|
|
|
|
try{ |
|
|
|
|
if(!StringUtil.hasLength(trayCode)){ |
|
|
|
|
log.warn(method+"托盘码不能为空 trayCode={}",trayCode); |
|
|
|
|
return R.fail(403,"托盘码不能为空"); |
|
|
|
|
} |
|
|
|
|
// if(Objects.isNull(codeType)){
|
|
|
|
|
// log.warn(method+"码值类型不能为空 codeType={}",codeType);
|
|
|
|
|
// return R.fail(403,"码值类型不能为空");
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//查询该库位的货物信息
|
|
|
|
|
ReCheckTrayVO reCheckTrayVO = warehouseInventoryService.getReCheckTray(trayCode); |
|
|
|
|
return R.data(reCheckTrayVO); |
|
|
|
|
}catch (CustomerException e){ |
|
|
|
|
log.warn(e.message); |
|
|
|
|
return R.fail(e.code,e.message); |
|
|
|
|
@ -61,6 +89,41 @@ public class WarehouseInventoryApiController {
|
|
|
|
|
log.error(method+"系统异常，联系管理员",e); |
|
|
|
|
return R.fail(500,"系统异常，联系管理员"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
|
@PostMapping("/checkGoodsByAllocation") |
|
|
|
|
@ApiOperationSupport(order = 1) |
|
|
|
|
@ApiOperation(value = "复核库位", notes = "传入checkDTO") |
|
|
|
|
public R checkGoodsByAllocation(@RequestBody CheckDTO checkDTO) { |
|
|
|
|
String method = "###########checkGoodsByAllocation: "; |
|
|
|
|
log.info(method + "复核库位 checkDTO={}", checkDTO); |
|
|
|
|
Long allocationId = checkDTO.getAllocationId(); |
|
|
|
|
try{ |
|
|
|
|
if(Objects.isNull(allocationId)){ |
|
|
|
|
log.warn(method+"库位ID不能为空 allocationId={}",allocationId); |
|
|
|
|
return R.fail(403,"库位ID不能为空"); |
|
|
|
|
} |
|
|
|
|
// if(Objects.isNull(codeType)){
|
|
|
|
|
// log.warn(method+"码值类型不能为空 codeType={}",codeType);
|
|
|
|
|
// return R.fail(403,"码值类型不能为空");
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//查询该库位的货物信息
|
|
|
|
|
TragetAllocationVO goodsByAllocation = warehouseUpdownTypeService.findGoodsByAllocation(allocationId); |
|
|
|
|
return R.data(goodsByAllocation); |
|
|
|
|
}catch (CustomerException e){ |
|
|
|
|
log.warn(e.message); |
|
|
|
|
return R.fail(e.code,e.message); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
log.error(method+"系统异常，联系管理员",e); |
|
|
|
|
return R.fail(500,"系统异常，联系管理员"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
zhenghaoyu
1 year ago