|
|
@ -43,6 +43,7 @@ import javax.annotation.Resource;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
@RestController
|
|
|
|
@RestController
|
|
|
@ -158,8 +159,21 @@ public class StockOrderController {
|
|
|
|
if (!verifyResult) {
|
|
|
|
if (!verifyResult) {
|
|
|
|
return ResultVOUtils.error(500, "实际数量不能高于订单数量");
|
|
|
|
return ResultVOUtils.error(500, "实际数量不能高于订单数量");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
List<String> filterList = new ArrayList<String>();
|
|
|
|
|
|
|
|
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderPostRequest.getSubErpOrders()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
filterList.add(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()) + StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
HashSet<String> set = new HashSet<>(filterList);
|
|
|
|
|
|
|
|
Boolean result = set.size() == filterList.size() ? true : false;
|
|
|
|
|
|
|
|
if (!result) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500, "存在相同批次产品,提交失败!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(stockOrderEntity.getId())) {
|
|
|
|
if (StringUtils.isBlank(stockOrderEntity.getId())) {
|
|
|
|
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
|
|
|
|
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
|
|
|
|
if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) {
|
|
|
|
if (StrUtil.isEmpty(stockOrderPostRequest.getBillNo())) {
|
|
|
|