出库复核及交接状态修改逻辑修改;
This commit is contained in:
+3
@@ -176,6 +176,9 @@ public class HandoverTaskOrderDomainService {
|
|||||||
String orderNumber = handoverTaskOrder.getOrderNumber();
|
String orderNumber = handoverTaskOrder.getOrderNumber();
|
||||||
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda()
|
StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda()
|
||||||
.eq(StockOutOrder::getOutOrderNumber, orderNumber));
|
.eq(StockOutOrder::getOutOrderNumber, orderNumber));
|
||||||
|
//完成交接状态改为已出库
|
||||||
|
stockOutOrder.setStatus(9);
|
||||||
|
stockOutOrderMapper.updateById(stockOutOrder);
|
||||||
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
|
List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailMapper.selectList(new QueryWrapper<OutMaterialDetail>().lambda()
|
||||||
.eq(OutMaterialDetail::getOutOrderNumber, orderNumber));
|
.eq(OutMaterialDetail::getOutOrderNumber, orderNumber));
|
||||||
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
|
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ public class StockOutOrder extends BaseVOEntity {
|
|||||||
@Excel(name = "出库单号")
|
@Excel(name = "出库单号")
|
||||||
private String outOrderNumber;
|
private String outOrderNumber;
|
||||||
|
|
||||||
@ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
|
@ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
||||||
@Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
|
@Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
@ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
|
||||||
|
|||||||
+1
-1
@@ -1211,7 +1211,7 @@ public class StockOutOrderDomainService {
|
|||||||
}
|
}
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
stockOutOrderService.update(null, new UpdateWrapper<StockOutOrder>().lambda()
|
stockOutOrderService.update(null, new UpdateWrapper<StockOutOrder>().lambda()
|
||||||
.set(StockOutOrder::getStatus, 9)
|
.set(StockOutOrder::getStatus, 12)
|
||||||
.set(StockOutOrder::getCheckStatus, 3)
|
.set(StockOutOrder::getCheckStatus, 3)
|
||||||
.set(StockOutOrder::getUpdateBy, loginUser.getUserid())
|
.set(StockOutOrder::getUpdateBy, loginUser.getUserid())
|
||||||
.set(StockOutOrder::getUpdateByName, loginUser.getUsername())
|
.set(StockOutOrder::getUpdateByName, loginUser.getUsername())
|
||||||
|
|||||||
Reference in New Issue
Block a user