|
@@ -501,7 +501,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,String targetStorgeId) {
|
|
|
+ public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,TaskNode taskNode) {
|
|
|
List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getCompleteBatchNo,completeBatchNo));
|
|
|
if(CollectionUtil.isNotEmpty(list)){
|
|
|
TWorkpiece tWorkpiece = list.get(0);
|
|
@@ -515,9 +515,9 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
|
|
|
tWorkpiece.setPpointId(pstorge.getPointId());
|
|
|
}
|
|
|
|
|
|
- if(StringUtil.isNotEmpty(targetStorgeId)){
|
|
|
- Storge tstorge = storgeMapper.selectById(targetStorgeId);
|
|
|
- tWorkpiece.setTstorgeId(Long.parseLong(targetStorgeId));
|
|
|
+ if(taskNode.getTargetResourceId()!=null){
|
|
|
+ Storge tstorge = storgeMapper.selectById(taskNode.getTargetResourceId());
|
|
|
+ tWorkpiece.setTstorgeId(taskNode.getTargetResourceId());
|
|
|
tWorkpiece.setTpointId(tstorge.getPointId());
|
|
|
}
|
|
|
|