1.修复生成单据详情拷贝属性异常导致单据无法处理完成的问题

zhairh
x_z 3 years ago
parent f9e8408fa0
commit 46d5c2567b

@ -253,7 +253,6 @@ public class WareHouseController {
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_PROCESS && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_FAIL) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_PROCESS && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_FAIL) {
return ResultVOUtils.error(500, "单据已提交!"); return ResultVOUtils.error(500, "单据已提交!");
} }
orderService.updateOrderStatus(orderEntity.getId(),4);
ioTransInoutService.repeatCommit(commitRequest); ioTransInoutService.repeatCommit(commitRequest);
return ResultVOUtils.success("提交成功"); return ResultVOUtils.success("提交成功");
} }

@ -100,7 +100,11 @@ public class InoutUtils {
if (udiRelevanceResponse == null) { if (udiRelevanceResponse == null) {
udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity, udiDlHttpClient); udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity, udiDlHttpClient);
} else { } else {
BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity); if (null == udiRelevanceResponse.getUseMuti()) {
BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity,"useMuti");
} else {
BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity);
}
udiInfoEntity.setRelId(udiRelevanceResponse.getId() + ""); udiInfoEntity.setRelId(udiRelevanceResponse.getId() + "");
udiInfoEntity.setCode(warehouseEntity.getCode()); udiInfoEntity.setCode(warehouseEntity.getCode());
// udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity); // udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);

@ -270,7 +270,6 @@ public class IoTransInoutService {
public void transInout(OrderEntity orderEntity) { public void transInout(OrderEntity orderEntity) {
orderEntity.setRemark("正在处理!"); orderEntity.setRemark("正在处理!");
// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_DOING);
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
orderService.updateOrder(orderEntity); orderService.updateOrder(orderEntity);

Loading…
Cancel
Save