|
|
|
@ -100,15 +100,15 @@ public class ProOrderServiceImpl implements IProOrderService {
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public AjaxResult subSplitOrder(SplitOrderDTO splitOrderDTO) {
|
|
|
|
|
boolean checkout = true;
|
|
|
|
|
// 校验批次编号是否存在(重复问题)
|
|
|
|
|
List<String> batchCodes = proOrderMapper.selectBatchCodes();
|
|
|
|
|
for (int i = 0; i < batchCodes.size(); i++) {
|
|
|
|
|
for (int j = 0; j < splitOrderDTO.getFormFields().size(); j++) {
|
|
|
|
|
if (batchCodes.get(i).equals(splitOrderDTO.getFormFields().get(j).getBatchCode())) {
|
|
|
|
|
checkout = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// // 校验批次编号是否存在(重复问题)
|
|
|
|
|
// List<String> batchCodes = proOrderMapper.selectBatchCodes();//这种校验不可取需要修改
|
|
|
|
|
// for (int i = 0; i < batchCodes.size(); i++) {
|
|
|
|
|
// for (int j = 0; j < splitOrderDTO.getFormFields().size(); j++) {
|
|
|
|
|
// if (batchCodes.get(i).equals(splitOrderDTO.getFormFields().get(j).getBatchCode())) {
|
|
|
|
|
// checkout = false;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//校验各工序设备是否已选择
|
|
|
|
|
List<CascaderDTO> processes= proOrderMapper.getRouteProcess(splitOrderDTO.getRouteCode());
|
|
|
|
|
if(splitOrderDTO.getProdLineCodeArray().length == 0){
|
|
|
|
@ -134,7 +134,7 @@ public class ProOrderServiceImpl implements IProOrderService {
|
|
|
|
|
splitOrderDTO.setProdLineCode(codeArray);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 如果不重复
|
|
|
|
|
// 如果校验通过
|
|
|
|
|
if (checkout) {
|
|
|
|
|
|
|
|
|
|
/****白坯订单*****/
|
|
|
|
|