|
|
|
@ -1191,7 +1191,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
//@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
@DS("#header.poolName")
|
|
|
|
|
public int updateWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch) {
|
|
|
|
|
String workOrderCode = proOrderWorkorderBatch.getWorkorderCode();
|
|
|
|
@ -1218,10 +1218,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
|
|
|
|
|
if(proOrderWorkorderBatch.getNewBatchQuantity() != null){
|
|
|
|
|
Long newBatchQuantity = proOrderWorkorderBatch.getNewBatchQuantity();
|
|
|
|
|
if(m==0 || m== workOrders.size()-1){
|
|
|
|
|
// 设置子工单数量
|
|
|
|
|
if(m==0){
|
|
|
|
|
batch.setNewBatchQuantity(newBatchQuantity);
|
|
|
|
|
}else{
|
|
|
|
|
// 设置子工单数量
|
|
|
|
|
batch.setNewBatchQuantity(workOrders.get(m-1).getUmrez()
|
|
|
|
|
.multiply(new BigDecimal(newBatchQuantity)).longValue());
|
|
|
|
|
}
|
|
|
|
|