|
|
@ -273,6 +273,7 @@ public class OrderDetailController {
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
|
|
|
|
stockOrderDetailEntity.setRelId(udiRelevanceEntity.getId());
|
|
|
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
|
|
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
|
|
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
|
|
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -337,7 +338,7 @@ public class OrderDetailController {
|
|
|
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
|
|
|
|
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
|
|
|
|
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
|
|
|
|
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
|
|
|
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
|
|
|
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(thrOrderDetailEntity.getProductId());
|
|
|
|
|
|
|
|
|
|
|
|
if (udiRelevanceEntity == null) {
|
|
|
|
if (udiRelevanceEntity == null) {
|
|
|
|
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
|
|
|
|
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
|
|
|
@ -348,6 +349,7 @@ public class OrderDetailController {
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
|
|
|
|
|
|
|
|
stockOrderDetailEntity.setRelId(udiRelevanceEntity.getId());
|
|
|
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
|
|
|
stockOrderDetailEntity.setSweepCount(0 + "");
|
|
|
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
|
|
|
stockOrderDetailEntityList.add(stockOrderDetailEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|